diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 103d06f31..dfaf09c21 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -725,7 +725,7 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
     }
 
     // Create the world
-    mEnvironment.setWorld(new MWWorld::World (mViewer, rootNode, mResourceSystem.get(), mWorkQueue.get(),
+    mEnvironment.setWorld( new MWWorld::World (mViewer, rootNode, mResourceSystem.get(), mWorkQueue.get(),
         mFileCollections, mContentFiles, mGroundcoverFiles, mEncoder, mActivationDistanceOverride, mCellName,
         mStartupScript, mResDir.string(), mCfgMgr.getUserDataPath().string()));
     mEnvironment.getWorld()->setupPlayer();
diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp
index b85358c20..7386c0069 100644
--- a/apps/openmw/mwrender/objectpaging.cpp
+++ b/apps/openmw/mwrender/objectpaging.cpp
@@ -373,6 +373,7 @@ namespace MWRender
         std::map<ESM::RefNum, ESM::CellRef> refs;
         std::vector<ESM::ESMReader> esm;
         const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
+
         for (int cellX = startCell.x(); cellX < startCell.x() + size; ++cellX)
         {
             for (int cellY = startCell.y(); cellY < startCell.y() + size; ++cellY)
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 68576cf44..6ba4baec5 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -73,6 +73,7 @@
 
 namespace MWRender
 {
+
     class StateUpdater : public SceneUtil::StateSetUpdater
     {
     public:
diff --git a/apps/openmw/mwworld/cellreflist.hpp b/apps/openmw/mwworld/cellreflist.hpp
index 69161c840..30be4a661 100644
--- a/apps/openmw/mwworld/cellreflist.hpp
+++ b/apps/openmw/mwworld/cellreflist.hpp
@@ -24,8 +24,6 @@ namespace MWWorld
         /// all methods are known.
         void load (ESM::CellRef &ref, bool deleted, const MWWorld::ESMStore &esmStore);
 
-        inline bool ignoreInstance (const X* ptr);
-
         LiveRef &insert (const LiveRef &item)
         {
             mList.push_back(item);
diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index 7ca35a1df..3f98684ae 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -169,6 +169,7 @@ namespace
 
 namespace MWWorld
 {
+
     template <typename X>
     void CellRefList<X>::load(ESM::CellRef &ref, bool deleted, const MWWorld::ESMStore &esmStore)
     {
diff --git a/apps/openmw/mwworld/esmloader.cpp b/apps/openmw/mwworld/esmloader.cpp
index 46b806582..b12d646e7 100644
--- a/apps/openmw/mwworld/esmloader.cpp
+++ b/apps/openmw/mwworld/esmloader.cpp
@@ -17,15 +17,15 @@ EsmLoader::EsmLoader(MWWorld::ESMStore& store, std::vector<ESM::ESMReader>& read
 
 void EsmLoader::load(const boost::filesystem::path& filepath, int& index)
 {
-    ContentLoader::load(filepath.filename(), index);
+  ContentLoader::load(filepath.filename(), index);
 
-    ESM::ESMReader lEsm;
-    lEsm.setEncoder(mEncoder);
-    lEsm.setIndex(index);
-    lEsm.setGlobalReaderList(&mEsm);
-    lEsm.open(filepath.string());
-    mEsm[index] = lEsm;
-    mStore.load(mEsm[index], &mListener);
+  ESM::ESMReader lEsm;
+  lEsm.setEncoder(mEncoder);
+  lEsm.setIndex(index);
+  lEsm.setGlobalReaderList(&mEsm);
+  lEsm.open(filepath.string());
+  mEsm[index] = lEsm;
+  mStore.load(mEsm[index], &mListener);
 }
 
 } /* namespace MWWorld */
diff --git a/components/esm/esmreader.hpp b/components/esm/esmreader.hpp
index c660b0dda..761756e8f 100644
--- a/components/esm/esmreader.hpp
+++ b/components/esm/esmreader.hpp
@@ -289,6 +289,7 @@ private:
   ToUTF8::Utf8Encoder* mEncoder;
 
   size_t mFileSize;
+
 };
 }
 #endif