diff --git a/CampusAppWP8/CampusAppWP8/Api/GeoApi/PisApi.cs b/CampusAppWP8/CampusAppWP8/Api/GeoApi/PisApi.cs
index ed6af279..a35d987b 100644
--- a/CampusAppWP8/CampusAppWP8/Api/GeoApi/PisApi.cs
+++ b/CampusAppWP8/CampusAppWP8/Api/GeoApi/PisApi.cs
@@ -8,12 +8,12 @@
 
 namespace CampusAppWP8.Api.GeoApi
 {
+    using System.Collections.Generic;
     using CampusAppWP8.Model;
     using CampusAppWP8.Model.GeoDb;
     using CampusAppWP8.Resources;
     using CampusAppWPortalLib8.Model;
     using CampusAppWPortalLib8.Model.Utility;
-    using System.Collections.Generic;    
 
     /// <summary>Pis api.</summary>
     /// <remarks>Stubbfel, 09.09.2013.</remarks>
diff --git a/CampusAppWP8/CampusAppWP8/Api/GeoApi/PssApi.cs b/CampusAppWP8/CampusAppWP8/Api/GeoApi/PssApi.cs
index a018a069..77e91e24 100644
--- a/CampusAppWP8/CampusAppWP8/Api/GeoApi/PssApi.cs
+++ b/CampusAppWP8/CampusAppWP8/Api/GeoApi/PssApi.cs
@@ -8,12 +8,12 @@
 
 namespace CampusAppWP8.Api.GeoApi
 {
+    using System.Collections.Generic;
     using CampusAppWP8.Model;
     using CampusAppWP8.Model.GeoDb;
     using CampusAppWP8.Resources;
     using CampusAppWPortalLib8.Model;
     using CampusAppWPortalLib8.Model.Utility;
-    using System.Collections.Generic;
 
     /// <summary>Pss api.</summary>
     /// <remarks>Stubbfel, 09.09.2013.</remarks>
diff --git a/CampusAppWP8/CampusAppWP8/Api/GeoApi/SpsApi.cs b/CampusAppWP8/CampusAppWP8/Api/GeoApi/SpsApi.cs
index 02a90600..6c00b9ee 100644
--- a/CampusAppWP8/CampusAppWP8/Api/GeoApi/SpsApi.cs
+++ b/CampusAppWP8/CampusAppWP8/Api/GeoApi/SpsApi.cs
@@ -7,14 +7,13 @@
 //----------------------------------------------------------------------
 namespace CampusAppWP8.Api.GeoApi
 {
-    using System.Collections.Generic;
+    using System.Collections.Generic;  
     using CampusAppWP8.Model;
     using CampusAppWP8.Model.GeoDb;
-    using CampusAppWP8.Model.Utility;
     using CampusAppWP8.Resources;
     using CampusAppWP8.Utility;
-    using CampusAppWPortalLib8.Model.Utility;
-    using CampusAppWPortalLib8.Model;    
+    using CampusAppWPortalLib8.Model;
+    using CampusAppWPortalLib8.Model.Utility;     
 
     /// <summary>
     /// Class for SPSAPI
diff --git a/CampusAppWP8/CampusAppWP8/File/Exams/ExamFile.cs b/CampusAppWP8/CampusAppWP8/File/Exams/ExamFile.cs
index d5334565..e4f71f58 100644
--- a/CampusAppWP8/CampusAppWP8/File/Exams/ExamFile.cs
+++ b/CampusAppWP8/CampusAppWP8/File/Exams/ExamFile.cs
@@ -50,7 +50,7 @@ namespace CampusAppWP8.File.Exams
         {
             if (this.storageFile == null)
             {
-                this.storageFile = await ((CampusAppWP8.Utility.File)(this.File)).AsStorageFile();
+                this.storageFile = await this.File.AsStorageFile();
             }
 
             if (this.storageFile != null)
diff --git a/CampusAppWP8/CampusAppWP8/Model/BinaryModel.cs b/CampusAppWP8/CampusAppWP8/Model/BinaryModel.cs
index 9aa6e9b3..bcb8b39b 100644
--- a/CampusAppWP8/CampusAppWP8/Model/BinaryModel.cs
+++ b/CampusAppWP8/CampusAppWP8/Model/BinaryModel.cs
@@ -6,9 +6,10 @@
 // <sience>03.09.2013</sience>
 //----------------------------------------------------------------------
 
-using CampusAppWPortalLib8.Model;
 namespace CampusAppWP8.Model
 {
+    using CampusAppWPortalLib8.Model;
+
     /// <summary>Binary model.</summary>
     /// <remarks>Stubbfel, 03.09.2013.</remarks>
     public abstract class BinaryModel : MainModel<byte[]>
diff --git a/CampusAppWP8/CampusAppWP8/Model/XmlModel.cs b/CampusAppWP8/CampusAppWP8/Model/XmlModel.cs
index 972c8f9c..c0a24f9d 100644
--- a/CampusAppWP8/CampusAppWP8/Model/XmlModel.cs
+++ b/CampusAppWP8/CampusAppWP8/Model/XmlModel.cs
@@ -10,6 +10,7 @@ namespace CampusAppWP8.Model
     using System.Text;
     using CampusAppWPortalLib8.Utility;
     using CampusAppWPortalLib8.Model;
+    using CampusAppWPortalLib8.Resources;
     
     /// <summary>
     /// Xml model io handler class.
@@ -28,7 +29,7 @@ namespace CampusAppWP8.Model
         public XmlModel(ModelType modelType, string fileName, string url)
             : base(modelType, fileName, url)
         {
-            this.ValidRootName = CampusAppWPortalLib8.Resources.Constants.XMLRootElementName;
+            this.ValidRootName = Constants.XMLRootElementName;
         }
 
         /// <summary>
@@ -40,7 +41,7 @@ namespace CampusAppWP8.Model
         public XmlModel(ModelType modelType, string sourceName)
             : base(modelType, sourceName)
         {
-            this.ValidRootName = CampusAppWPortalLib8.Resources.Constants.XMLRootElementName;
+            this.ValidRootName = Constants.XMLRootElementName;
         }
 
         #endregion