diff --git a/CampusAppWP8/CampusAppWP8/Api/Lecture/LectureApi.cs b/CampusAppWP8/CampusAppWP8/Api/Lecture/LectureApi.cs
index ddcf309d..da60d1a9 100644
--- a/CampusAppWP8/CampusAppWP8/Api/Lecture/LectureApi.cs
+++ b/CampusAppWP8/CampusAppWP8/Api/Lecture/LectureApi.cs
@@ -7,11 +7,9 @@
 //----------------------------------------------------------------------
 namespace CampusAppWP8.Feed.Lecture
 {
-    using System;
+    using CampusAppWP8.Model;
     using CampusAppWP8.Model.Lecture;
     using CampusAppWP8.Resources;
-    using CampusAppWP8.Utility;
-    using CampusAppWP8.Model;
     
     /// <summary>
     /// Class for the feed of the Lecture
diff --git a/CampusAppWP8/CampusAppWP8/App.xaml b/CampusAppWP8/CampusAppWP8/App.xaml
index 5358a12e..a4aef1d3 100644
--- a/CampusAppWP8/CampusAppWP8/App.xaml
+++ b/CampusAppWP8/CampusAppWP8/App.xaml
@@ -23,7 +23,7 @@
 
     <Application.ApplicationLifetimeObjects>
         <!--Erforderliches Objekt, das Lebensdauerereignisse der Anwendung behandelt-->
-    	<shell:PhoneApplicationService
+        <shell:PhoneApplicationService
     		Launching="Application_Launching" Closing="Application_Closing"
     		Activated="Application_Activated" Deactivated="Application_Deactivated"/>
     </Application.ApplicationLifetimeObjects>
diff --git a/CampusAppWP8/CampusAppWP8/App.xaml.cs b/CampusAppWP8/CampusAppWP8/App.xaml.cs
index e0f3e904..55788b88 100644
--- a/CampusAppWP8/CampusAppWP8/App.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/App.xaml.cs
@@ -1,13 +1,12 @@
-using System;
+using CampusAppWP8.Resources;
+using Microsoft.Phone.Controls;
+using Microsoft.Phone.Shell;
+using System;
 using System.Diagnostics;
-using System.Resources;
+using System.IO.IsolatedStorage;
 using System.Windows;
 using System.Windows.Markup;
 using System.Windows.Navigation;
-using Microsoft.Phone.Controls;
-using Microsoft.Phone.Shell;
-using CampusAppWP8.Resources;
-using System.IO.IsolatedStorage;
 
 
 namespace CampusAppWP8
@@ -84,10 +83,11 @@ namespace CampusAppWP8
         public static T LoadFromIsolatedStorage<T>(string key)
         {
             IsolatedStorageSettings isolatedStore = IsolatedStorageSettings.ApplicationSettings;
-            
-            if(isolatedStore.Contains(key)) {
+
+            if (isolatedStore.Contains(key))
+            {
                 object value = isolatedStore[key];
-                return  (T)value;
+                return (T)value;
             }
             return default(T);
         }
diff --git a/CampusAppWP8/CampusAppWP8/Feed/Departments/DepartmentFavoriteFeed.cs b/CampusAppWP8/CampusAppWP8/Feed/Departments/DepartmentFavoriteFeed.cs
index 053ad487..3d844c1a 100644
--- a/CampusAppWP8/CampusAppWP8/Feed/Departments/DepartmentFavoriteFeed.cs
+++ b/CampusAppWP8/CampusAppWP8/Feed/Departments/DepartmentFavoriteFeed.cs
@@ -7,13 +7,11 @@
 //----------------------------------------------------------------------using System;
 namespace CampusAppWP8.Feed.Departments
 {
-    using System;
     using System.IO;
     using CampusAppWP8.Model;
     using CampusAppWP8.Model.Departments;
     using CampusAppWP8.Resources;
-    using CampusAppWP8.Utility;
-    
+
     /// <summary>
     /// Feed object to handle favorite department feeds. 
     /// </summary>
diff --git a/CampusAppWP8/CampusAppWP8/Feed/Link/CommonLinkFeed.cs b/CampusAppWP8/CampusAppWP8/Feed/Link/CommonLinkFeed.cs
index 6b756de6..f63e2b37 100644
--- a/CampusAppWP8/CampusAppWP8/Feed/Link/CommonLinkFeed.cs
+++ b/CampusAppWP8/CampusAppWP8/Feed/Link/CommonLinkFeed.cs
@@ -71,8 +71,6 @@ namespace CampusAppWP8.Feed.Link
             return this.CheckIsUpToDate(lastModified);
         }
 
-
-
         /// <summary>
         /// Check if the model or file is up-to-date.
         /// </summary>
diff --git a/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeed.cs b/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeed.cs
index 03b09f06..3188d297 100644
--- a/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeed.cs
+++ b/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeed.cs
@@ -12,7 +12,6 @@ namespace CampusAppWP8.Feed.Mensa
     using CampusAppWP8.Model;
     using CampusAppWP8.Model.Mensa;
     using CampusAppWP8.Resources;
-    using CampusAppWP8.Utility;
 
     /// <summary>
     /// This Class is for MensaFeeds
@@ -88,7 +87,6 @@ namespace CampusAppWP8.Feed.Mensa
             return true;
         }
 
-
         #endregion
 
         #endregion
diff --git a/CampusAppWP8/CampusAppWP8/Feed/Openinghours/OpeninghoursFeed.cs b/CampusAppWP8/CampusAppWP8/Feed/Openinghours/OpeninghoursFeed.cs
index ae754db0..3a6f083c 100644
--- a/CampusAppWP8/CampusAppWP8/Feed/Openinghours/OpeninghoursFeed.cs
+++ b/CampusAppWP8/CampusAppWP8/Feed/Openinghours/OpeninghoursFeed.cs
@@ -7,7 +7,6 @@
 //----------------------------------------------------------------------
 namespace CampusAppWP8.Feed.Openinghours
 {
-    using System;
     using System.IO;
     using CampusAppWP8.Model;
     using CampusAppWP8.Model.Openinghours;
diff --git a/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureActivity.cs b/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureActivity.cs
index 8f5b171e..f246118d 100644
--- a/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureActivity.cs
+++ b/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureActivity.cs
@@ -83,7 +83,7 @@ namespace CampusAppWP8.Model.Lecture
         public LectureModule Modul { get; set; }
 
         /// <summary>
-        /// Gets or sets LectureTitel
+        /// Gets or sets LectureTitle
         /// </summary>
         [XmlElement("titel")]
         public string Title { get; set; }
@@ -196,7 +196,7 @@ namespace CampusAppWP8.Model.Lecture
             string result = string.Empty;
             foreach (LectureLecturer tmpLecturer in this.Lecturer)
             {
-                result +=  StringManager.AddNewLine(tmpLecturer.ToString());
+                result += StringManager.AddNewLine(tmpLecturer.ToString());
             }
 
             this.LecturerString = StringManager.RemvoveNewLine(result);
diff --git a/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureDate.cs b/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureDate.cs
index b84ef789..701f9ef4 100644
--- a/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureDate.cs
+++ b/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureDate.cs
@@ -62,6 +62,5 @@ namespace CampusAppWP8.Model.Lecture
         /// </summary>
         [XmlElement("enddatum")]
         public string EndDate { get; set; }
-
     }
 }
diff --git a/CampusAppWP8/CampusAppWP8/Model/Lecture/LecturePageModel.cs b/CampusAppWP8/CampusAppWP8/Model/Lecture/LecturePageModel.cs
index 48253fb2..cca12fe5 100644
--- a/CampusAppWP8/CampusAppWP8/Model/Lecture/LecturePageModel.cs
+++ b/CampusAppWP8/CampusAppWP8/Model/Lecture/LecturePageModel.cs
@@ -21,34 +21,6 @@ namespace CampusAppWP8.Model.Lecture
     {
         #region Members
 
-        /// <summary>
-        /// List for the courses of the BTU
-        /// </summary>
-        /// <remarks>
-        /// need to be extend to full list
-        /// </remarks>
-        private List<ListPickerItemModel> courseList;
-
-        /// <summary>
-        /// List of the degrees
-        /// </summary>
-        private List<ListPickerItemModel> degreeList;
-
-        /// <summary>
-        /// List of the semester
-        /// </summary>
-        private List<ListPickerItemModel> semesterList;
-
-        /// <summary>
-        /// List for the number of semester (from)
-        /// </summary>
-        private List<ListPickerItemModel> fromNumberList;
-
-        /// <summary>
-        /// List for the number of semester (to)
-        /// </summary>
-        private List<ListPickerItemModel> toNumberList;
-
         /// <summary>
         /// Variable for the courseIndex
         /// </summary>
@@ -79,6 +51,34 @@ namespace CampusAppWP8.Model.Lecture
         [DataMember]
         public int selectToIndex;
 
+        /// <summary>
+        /// List for the courses of the BTU
+        /// </summary>
+        /// <remarks>
+        /// need to be extend to full list
+        /// </remarks>
+        private List<ListPickerItemModel> courseList;
+
+        /// <summary>
+        /// List of the degrees
+        /// </summary>
+        private List<ListPickerItemModel> degreeList;
+
+        /// <summary>
+        /// List of the semester
+        /// </summary>
+        private List<ListPickerItemModel> semesterList;
+
+        /// <summary>
+        /// List for the number of semester (from)
+        /// </summary>
+        private List<ListPickerItemModel> fromNumberList;
+
+        /// <summary>
+        /// List for the number of semester (to)
+        /// </summary>
+        private List<ListPickerItemModel> toNumberList;
+
         #endregion
 
         #region Constructor
diff --git a/CampusAppWP8/CampusAppWP8/Model/Utility/URLParamModel.cs b/CampusAppWP8/CampusAppWP8/Model/Utility/URLParamModel.cs
index 186f6d61..a439e875 100644
--- a/CampusAppWP8/CampusAppWP8/Model/Utility/URLParamModel.cs
+++ b/CampusAppWP8/CampusAppWP8/Model/Utility/URLParamModel.cs
@@ -43,6 +43,7 @@ namespace CampusAppWP8.Model.Utility
             this.Value = value;
         }
         #endregion
+
         #region Proberty
 
         /// <summary>
@@ -62,7 +63,7 @@ namespace CampusAppWP8.Model.Utility
         }
 
         /// <summary>
-        /// Gets or sets the token, which indicate that tha paramterlist started
+        /// Gets the token, which indicate that the parameterList started
         /// </summary>
         public string ParamToken
         {
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs
index 2c6d8535..9879233b 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs
@@ -1,15 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Navigation;
+using CampusAppWP8.Model.Campusmap;
 using Microsoft.Phone.Controls;
-using Microsoft.Phone.Shell;
-using System.Windows.Media;
-using CampusAppWP8.Model.Campusmap;
-using System.Windows.Media.Imaging;
+using System.Windows;
+using System.Windows.Navigation;
 
 namespace CampusAppWP8.Pages.Campusmap
 {
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentIndexPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentIndexPage.xaml
index 8c1c6225..6ac7f84f 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentIndexPage.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentIndexPage.xaml
@@ -66,7 +66,7 @@
                                 <ColumnDefinition Width="64"/>
                                 <ColumnDefinition Width="*"/>
                             </Grid.ColumnDefinitions>
-                            
+
                             <Image Width="32" Height="32" Grid.Row="0" Grid.Column="0" Source="{Binding Path=ThemelizedIcon.Departments, Source={StaticResource ThemelizedIcons}}" HorizontalAlignment="Left" VerticalAlignment="Center"/>
                             <TextBlock Grid.Row="0" Grid.Column="1" Text="{Binding Name}" VerticalAlignment="Center"/>
                         </Grid>
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentPage.xaml
index 775f1c5d..d39e152b 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentPage.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentPage.xaml
@@ -54,7 +54,7 @@
                                                 </Grid.ColumnDefinitions>
                                                 <Image Grid.Column="0" Grid.Row="0" Height="32" Width="32" Source="{Binding Path=ThemelizedIcon.Add, Source={StaticResource ThemelizedIcons}}" HorizontalAlignment="Left" VerticalAlignment="Center"/>
                                                 <TextBlock Grid.Column="1" Grid.Row="0" Text="{Binding Path=LocalizedResources.Add, Source={StaticResource LocalizedStrings}}" VerticalAlignment="Center"/>
-                                            </Grid> 
+                                            </Grid>
                                         </Button>
                                         <!--info button-->
                                         <Button x:Name="InfoBtn" BorderBrush="Transparent" Tag="{Binding Url}" Click="InfoBtn_Click" HorizontalContentAlignment="Left">
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Events/EventPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Events/EventPage.xaml
index ab82f293..956943b7 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Events/EventPage.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/Events/EventPage.xaml
@@ -40,7 +40,7 @@
                                 <RowDefinition Height="100" />
                                 <RowDefinition Height="*" />
                             </Grid.RowDefinitions>
-                            
+
                             <TextBlock x:Name="EventHeadline" Text="{Binding Path=Title, Mode=OneWay}" Grid.Row="0" Height="Auto" TextWrapping="Wrap" VerticalAlignment="Center" HorizontalAlignment="Left" FontSize="42"/>
                             <ScrollViewer x:Name="EventTextScroll" Grid.Row="1">
                                 <TextBlock x:Name="EventText" Text="{Binding Path=Text, Mode=OneWay}" Height="Auto" TextWrapping="Wrap" VerticalAlignment="Center" HorizontalAlignment="Left" FontSize="24" />
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml
index acc05203..26787ad5 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml
@@ -132,7 +132,7 @@
                                         </Border>
                                     </DataTemplate>
                                 </toolkit:ListPicker.FullModeItemTemplate>
-                                
+
                             </toolkit:ListPicker>
                         </StackPanel>
                     </StackPanel>
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml.cs
index 37f46e87..6d9b5f85 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml.cs
@@ -10,13 +10,11 @@ namespace CampusAppWP8.Pages.Lecture
     using System;
     using System.Collections.Generic;
     using System.Windows;
-    using System.Windows.Media.Imaging;
     using System.Windows.Navigation;
     using CampusAppWP8.Feed.Lecture;
     using CampusAppWP8.Model.Lecture;
     using CampusAppWP8.Model.Utility;
     using CampusAppWP8.Resources;
-    using CampusAppWP8.Utility;
     using Microsoft.Phone.Controls;
 
     /// <summary>
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultPage.xaml.cs
index bee3a329..f464c0d3 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultPage.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultPage.xaml.cs
@@ -9,8 +9,6 @@ namespace CampusAppWP8.Pages.Lecture
 {
     using System;
     using System.Linq;
-    using System.Windows;
-    using System.Windows.Controls;
     using System.Windows.Navigation;
     using CampusAppWP8.Model.Lecture;
     using CampusAppWP8.Resources;
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Links/LinkPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Links/LinkPage.xaml.cs
index d71672e3..d62845ef 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Links/LinkPage.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/Links/LinkPage.xaml.cs
@@ -7,10 +7,10 @@
 //----------------------------------------------------------------------
 namespace CampusAppWP8.Pages.Links
 {
+    using System;
     using System.Windows.Navigation;
     using CampusAppWP8.Feed.Link;
     using Microsoft.Phone.Controls;
-    using System;
 
     /// <summary>
     /// Class for the LinkPage
@@ -126,7 +126,6 @@ namespace CampusAppWP8.Pages.Links
             {
                this.ProgressBar.Visibility = System.Windows.Visibility.Collapsed;
             }
-
         }
 
         /// <summary>
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml
index 712adcde..d3813f39 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml
@@ -19,13 +19,13 @@
         <!--Pivotsteuerelement-->
         <phone:Pivot Name="MensaPivot" Title="{Binding Path=LocalizedResources.MensaApp_Title, Source={StaticResource LocalizedStrings}}">
             <phone:Pivot.HeaderTemplate>
-            
+
                 <DataTemplate>
                     <StackPanel>
-                    <TextBlock Text="{Binding Day}"  />                   
+                        <TextBlock Text="{Binding Day}"  />
                     </StackPanel>
                 </DataTemplate>
-                
+
             </phone:Pivot.HeaderTemplate>
             <phone:Pivot.ItemTemplate>
                 <DataTemplate>
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs
index 640ce4a8..18bd2c01 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs
@@ -64,6 +64,7 @@ namespace CampusAppWP8.Pages.Mensa
             {
                 this.InitializeFeed();
             }
+
             this.ProgressBar.Visibility = System.Windows.Visibility.Visible;
             this.feed.LoadData();
         }
@@ -90,7 +91,6 @@ namespace CampusAppWP8.Pages.Mensa
             this.CalcSelectedIndex();
         }
 
-
         /// <summary>
         /// Method will be execute if the feed is ready
         /// </summary>
diff --git a/CampusAppWP8/CampusAppWP8/Pages/News/NewsIndexPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/News/NewsIndexPage.xaml
index 1170cb46..1deea115 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/News/NewsIndexPage.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/News/NewsIndexPage.xaml
@@ -42,7 +42,7 @@
                         </lui:NavigateButton>
                     </Border>
                 </DataTemplate>
-            </ListBox.ItemTemplate>            
+            </ListBox.ItemTemplate>
         </ListBox>
     </Grid>
 
diff --git a/CampusAppWP8/CampusAppWP8/Pages/News/NewsPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/News/NewsPage.xaml
index e694bfad..972abeb0 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/News/NewsPage.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/News/NewsPage.xaml
@@ -39,7 +39,7 @@
                                 <RowDefinition Height="100" />
                                 <RowDefinition Height="*" />
                             </Grid.RowDefinitions>
-                            
+
                             <TextBlock x:Name="NewsHeadline" Text="{Binding Path=Title, Mode=OneWay}" Grid.Row="0" Height="Auto" TextWrapping="Wrap" VerticalAlignment="Center" HorizontalAlignment="Left" FontSize="42"/>
                             <ScrollViewer Grid.Row="1">
                                 <TextBlock x:Name="NewsText" Text="{Binding Path=Text, Mode=OneWay}" Height="Auto" TextWrapping="Wrap" VerticalAlignment="Center" HorizontalAlignment="Left" FontSize="24" />
diff --git a/CampusAppWP8/CampusAppWP8/Pages/News/NewsPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/News/NewsPage.xaml.cs
index 089a71c6..709a6b7b 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/News/NewsPage.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/News/NewsPage.xaml.cs
@@ -18,7 +18,7 @@ namespace CampusAppWP8.Pages.News
     using CampusAppWP8.Utility;
     using Microsoft.Phone.Controls;
     using Microsoft.Phone.Shell;
-    
+
     /// <summary>
     /// EventPage, where every news fees has his own PivotItem.
     /// </summary>
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Openinghours/OpeninghoursPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Openinghours/OpeninghoursPage.xaml.cs
index 975de1f7..3d4d58c3 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Openinghours/OpeninghoursPage.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/Openinghours/OpeninghoursPage.xaml.cs
@@ -13,7 +13,7 @@ namespace CampusAppWP8.Pages.Openinghours
     using CampusAppWP8.Model.Openinghours;
     using CampusAppWP8.Resources;
     using Microsoft.Phone.Controls;
-    
+
     /// <summary>
     /// Opening hours page.
     /// </summary>
@@ -65,12 +65,12 @@ namespace CampusAppWP8.Pages.Openinghours
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
             base.OnNavigatedTo(e);
-        /*    
-            if (e.NavigationMode != System.Windows.Navigation.NavigationMode.Back)
-            {
-                this.ProgressBar.Visibility = System.Windows.Visibility.Visible;
-            }
-            */
+            /*    
+                if (e.NavigationMode != System.Windows.Navigation.NavigationMode.Back)
+                {
+                    this.ProgressBar.Visibility = System.Windows.Visibility.Visible;
+                }
+                */
             if (this.isNewInstance)
             {
                 if ((this.feed == null) || (this.feed.GetModel() == null))
@@ -132,7 +132,7 @@ namespace CampusAppWP8.Pages.Openinghours
 
         // private
         #endregion
-        
+
         // Method
         #endregion
     }
diff --git a/CampusAppWP8/CampusAppWP8/Styles/ListButton.xaml b/CampusAppWP8/CampusAppWP8/Styles/ListButton.xaml
index 959c2f6a..eeb2a249 100644
--- a/CampusAppWP8/CampusAppWP8/Styles/ListButton.xaml
+++ b/CampusAppWP8/CampusAppWP8/Styles/ListButton.xaml
@@ -9,7 +9,7 @@
         <Setter Property="BorderBrush" Value="{StaticResource PhoneContrastBackgroundBrush}"/>
         <Setter Property="BorderThickness" Value="6,3,6,3"/>
         <Setter Property="Margin" Value="-10"/>
-       <Setter Property="toolkit:TiltEffect.IsTiltEnabled" Value="True"/>
+        <Setter Property="toolkit:TiltEffect.IsTiltEnabled" Value="True"/>
     </Style>
     <Style x:Key="ListButtonNoneBorder" TargetType="Button">
         <Setter Property="Background" Value="{x:Null}"/>
diff --git a/CampusAppWP8/CampusAppWP8/ThemelizedIcons.cs b/CampusAppWP8/CampusAppWP8/ThemelizedIcons.cs
index 28f871bf..0cf17d0f 100644
--- a/CampusAppWP8/CampusAppWP8/ThemelizedIcons.cs
+++ b/CampusAppWP8/CampusAppWP8/ThemelizedIcons.cs
@@ -22,12 +22,12 @@ namespace CampusAppWP8
         /// <summary>
         /// Gets the resource object.
         /// </summary>
-        public Icons ThemelizedIcon 
+        public Icons ThemelizedIcon
         {
-            get 
-            { 
-                return themelized; 
-            } 
+            get
+            {
+                return themelized;
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/CampusAppWP8/CampusAppWP8/Utility/File.cs b/CampusAppWP8/CampusAppWP8/Utility/File.cs
index b3e51dc0..6b6349a5 100644
--- a/CampusAppWP8/CampusAppWP8/Utility/File.cs
+++ b/CampusAppWP8/CampusAppWP8/Utility/File.cs
@@ -108,7 +108,7 @@ namespace CampusAppWP8.Utility
             if (this.Exist() == true)
             {
                 IOTypeRead tempType = ioType;
-                
+
                 if (tempType == IOTypeRead.INVALID)
                 {
                     tempType = this.readType;
@@ -117,7 +117,7 @@ namespace CampusAppWP8.Utility
                 if (tempType == IOTypeRead.ReadAsync)
                 {
                     // retValue = this.ReadAsync();
-                    retValue = this.ReadSync(); 
+                    retValue = this.ReadSync();
                 }
                 else if (tempType == IOTypeRead.ReadSync)
                 {
@@ -149,7 +149,7 @@ namespace CampusAppWP8.Utility
             else if (tempType == IOTypeWrite.WriteSync)
             {
                 // this.WriteSync(data);
-                this.WriteAsync(data); 
+                this.WriteAsync(data);
             }
         }
 
diff --git a/CampusAppWP8/CampusAppWP8/Utility/HttpRequest.cs b/CampusAppWP8/CampusAppWP8/Utility/HttpRequest.cs
index 859a8982..810bd29b 100644
--- a/CampusAppWP8/CampusAppWP8/Utility/HttpRequest.cs
+++ b/CampusAppWP8/CampusAppWP8/Utility/HttpRequest.cs
@@ -20,7 +20,7 @@ namespace CampusAppWP8.Utility
         #region Member
 
         /// <summary>
-        /// BaseAddress of the webclient
+        /// BaseAddress of the webClient
         /// </summary>
         private string baseAddress;
         #endregion
@@ -40,7 +40,7 @@ namespace CampusAppWP8.Utility
         /// <param name="apiBaseAddress">the url of the HttpRequest base address</param>
         public HttpRequest(Uri apiBaseAddress)
         {
-            baseAddress = apiBaseAddress.AbsoluteUri;
+            this.baseAddress = apiBaseAddress.AbsoluteUri;
         }
 
         #endregion
@@ -79,7 +79,7 @@ namespace CampusAppWP8.Utility
                 paramterStr += parameter.ToString();
             }
 
-            string getUrlStr = baseAddress + seperator + paramterStr;
+            string getUrlStr = this.baseAddress + seperator + paramterStr;
             return new Uri(getUrlStr, UriKind.Absolute);
         }
 
diff --git a/CampusAppWP8/CampusAppWP8/Utility/Lui/Button/GoToMapButton.cs b/CampusAppWP8/CampusAppWP8/Utility/Lui/Button/GoToMapButton.cs
index 591148e0..e20930e2 100644
--- a/CampusAppWP8/CampusAppWP8/Utility/Lui/Button/GoToMapButton.cs
+++ b/CampusAppWP8/CampusAppWP8/Utility/Lui/Button/GoToMapButton.cs
@@ -56,10 +56,10 @@ namespace CampusAppWP8.Utility.Lui.Button
         /// Gets or sets the Url
         /// </summary>
         public object SearchTerm
-         {
-             get { return (object)this.GetValue(SearchTermProperty); }
-             set { this.SetValue(SearchTermProperty, value); }
-         }
+        {
+            get { return (object)this.GetValue(SearchTermProperty); }
+            set { this.SetValue(SearchTermProperty, value); }
+        }
 
         #endregion
 
@@ -75,7 +75,7 @@ namespace CampusAppWP8.Utility.Lui.Button
         {
             MapsTask mapsTask = new MapsTask();
             mapsTask.Center = new GeoCoordinate(51.766788, 14.326681);
-            mapsTask.SearchTerm = this.SearchTerm as string;           
+            mapsTask.SearchTerm = this.SearchTerm as string;
             mapsTask.ZoomLevel = 15;
             mapsTask.Show();
         }
diff --git a/CampusAppWP8/CampusAppWP8/Utility/Lui/Button/UpdateButtonAppBar.cs b/CampusAppWP8/CampusAppWP8/Utility/Lui/Button/UpdateButtonAppBar.cs
index 36472d6a..466ac72c 100644
--- a/CampusAppWP8/CampusAppWP8/Utility/Lui/Button/UpdateButtonAppBar.cs
+++ b/CampusAppWP8/CampusAppWP8/Utility/Lui/Button/UpdateButtonAppBar.cs
@@ -8,7 +8,6 @@
 namespace CampusAppWP8.Utility.Lui.Button
 {
     using System;
-    using System.Windows;
     using CampusAppWP8.Resources;
     using Microsoft.Phone.Shell;
 
diff --git a/CampusAppWP8/CampusAppWP8/Utility/StringManager.cs b/CampusAppWP8/CampusAppWP8/Utility/StringManager.cs
index b5492b95..a213679e 100644
--- a/CampusAppWP8/CampusAppWP8/Utility/StringManager.cs
+++ b/CampusAppWP8/CampusAppWP8/Utility/StringManager.cs
@@ -39,7 +39,7 @@ namespace CampusAppWP8.Utility
         /// Method add an Newline to a string
         /// </summary>
         /// <param name="str">input string</param>
-        /// <returns>input string + \n</returns>
+        /// <returns>input string + newline</returns>
         public static string AddNewLine(string str)
         {
             return str.ToString() + "\n";
@@ -49,7 +49,7 @@ namespace CampusAppWP8.Utility
         /// Method remove(TrimEND!) an Newline to a string
         /// </summary>
         /// <param name="str">input string</param>
-        /// <returns>input string - \n</returns
+        /// <returns>input string - newline</returns
         public static string RemvoveNewLine(string str)
         {
             return str.TrimEnd('\n');
diff --git a/CampusAppWP8/CampusAppWP8/Utility/Utilities.cs b/CampusAppWP8/CampusAppWP8/Utility/Utilities.cs
index a6e822ea..243929ed 100644
--- a/CampusAppWP8/CampusAppWP8/Utility/Utilities.cs
+++ b/CampusAppWP8/CampusAppWP8/Utility/Utilities.cs
@@ -13,7 +13,7 @@ namespace CampusAppWP8.Utility
     using System.Windows;
     using System.Windows.Controls;
     using System.Windows.Media;
-    
+
     /// <summary>
     /// Collection of utility functions.
     /// </summary>
@@ -28,17 +28,17 @@ namespace CampusAppWP8.Utility
             /// Compare Equality.
             /// </summary>
             Equal,
-            
+
             /// <summary>
             /// Compare if less.
             /// </summary>
             Less,
-            
+
             /// <summary>
             /// Compare equality or less.
             /// </summary>
             LessEqual,
-            
+
             /// <summary>
             /// Compare greater.
             /// </summary>
@@ -135,7 +135,7 @@ namespace CampusAppWP8.Utility
             List<DependencyObject> l = Utilities.GetChild(rootObj, parentGridName);
             Grid parentGrid = l[index] as Grid;
             FrameworkElement elem = null;
-            
+
             foreach (FrameworkElement tempElem in parentGrid.Children)
             {
                 if (tempElem.Name == elemName)
diff --git a/CampusAppWP8/CampusAppWP8/Utility/XmlManager.cs b/CampusAppWP8/CampusAppWP8/Utility/XmlManager.cs
index 2a559743..e5b5d4f3 100644
--- a/CampusAppWP8/CampusAppWP8/Utility/XmlManager.cs
+++ b/CampusAppWP8/CampusAppWP8/Utility/XmlManager.cs
@@ -49,7 +49,7 @@ namespace CampusAppWP8.Utility
             string retValue = string.Empty;
 
             XmlSerializerNamespaces ns = new XmlSerializerNamespaces();
-            ns.Add("", "");
+            ns.Add(string.Empty, string.Empty);
 
             XmlSerializer serializer = new XmlSerializer(typeof(T));
             TextWriter writer = new StringWriter();