diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index c95a137ecc..548a871ce1 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -252,7 +252,6 @@ namespace MWWorld
         mProjectileManager->clear();
 
         mLocalScripts.clear();
-        mPlayer->clear();
 
         mWorldScene->changeToVoid();
 
@@ -261,9 +260,10 @@ namespace MWWorld
 
         if (mPlayer)
         {
-            mPlayer->setCell (0);
+	    mPlayer->clear();
+            mPlayer->setCell(0);
             mPlayer->getPlayer().getRefData() = RefData();
-            mPlayer->set (mStore.get<ESM::NPC>().find ("player"));
+            mPlayer->set(mStore.get<ESM::NPC>().find ("player"));
         }
 
         mCells.clear();
diff --git a/components/esm/loadclot.cpp b/components/esm/loadclot.cpp
index d64564d77f..17ecdf3ae5 100644
--- a/components/esm/loadclot.cpp
+++ b/components/esm/loadclot.cpp
@@ -8,33 +8,34 @@ namespace ESM
 {
     unsigned int Clothing::sRecordId = REC_CLOT;
 
-void Clothing::load(ESMReader &esm)
-{
-    mModel = esm.getHNString("MODL");
-    mName = esm.getHNOString("FNAM");
-    esm.getHNT(mData, "CTDT", 12);
+    void Clothing::load(ESMReader &esm)
+    {
+        mModel = esm.getHNString("MODL");
+        mName = esm.getHNOString("FNAM");
+        esm.getHNT(mData, "CTDT", 12);
 
-    mScript = esm.getHNOString("SCRI");
-    mIcon = esm.getHNOString("ITEX");
+        mScript = esm.getHNOString("SCRI");
+        mIcon = esm.getHNOString("ITEX");
 
-    mParts.load(esm);
+        mParts.load(esm);
 
 
-    mEnchant = esm.getHNOString("ENAM");
-}
-void Clothing::save(ESMWriter &esm) const
-{
-    esm.writeHNCString("MODL", mModel);
-    esm.writeHNOCString("FNAM", mName);
-    esm.writeHNT("CTDT", mData, 12);
+        mEnchant = esm.getHNOString("ENAM");
+    }
 
-    esm.writeHNOCString("SCRI", mScript);
-    esm.writeHNOCString("ITEX", mIcon);
+    void Clothing::save(ESMWriter &esm) const
+    {
+        esm.writeHNCString("MODL", mModel);
+        esm.writeHNOCString("FNAM", mName);
+        esm.writeHNT("CTDT", mData, 12);
 
-    mParts.save(esm);
+        esm.writeHNOCString("SCRI", mScript);
+        esm.writeHNOCString("ITEX", mIcon);
 
-    esm.writeHNOCString("ENAM", mEnchant);
-}
+        mParts.save(esm);
+
+        esm.writeHNOCString("ENAM", mEnchant);
+    }
 
     void Clothing::blank()
     {
@@ -46,7 +47,6 @@ void Clothing::save(ESMWriter &esm) const
         mName.clear();
         mModel.clear();
         mIcon.clear();
-        mIcon.clear();
         mEnchant.clear();
         mScript.clear();
     }