diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php
index d88dc1ac25..8016040f1e 100644
--- a/apps/files_trashbin/lib/trash.php
+++ b/apps/files_trashbin/lib/trash.php
@@ -349,7 +349,7 @@ class Trashbin {
 		$versionsName = \OCP\Config::getSystemValue('datadirectory').$view->getAbsolutePath($filename);
 		$versions = array();
 		if ($timestamp ) {
-		// fetch for old versions
+			// fetch for old versions
 			$matches = glob( $versionsName.'.v*.d'.$timestamp );
 			$offset = -strlen($timestamp)-2;
 		} else {
diff --git a/core/templates/exception.php b/core/templates/exception.php
index 4779222555..62d6cf2ade 100644
--- a/core/templates/exception.php
+++ b/core/templates/exception.php
@@ -20,11 +20,11 @@
 			echo 'Request Method: '  . $_['sysinfo']['requestmethod'] . "\n";
 			echo 'Database: '  . $_['sysinfo']['database'] . "\n";
 			echo '</textarea>';
-		}else{
+		} else {
 			echo 'Your administrator has disabled systeminformations.';
 		}
 		?>
 		</p>
 		</details>
 	</li>
-</ul>
\ No newline at end of file
+</ul>
diff --git a/lib/app.php b/lib/app.php
index 7eab140578..fe381a5707 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -76,14 +76,14 @@ class OC_App{
 				&& empty(OC_Util::$core_scripts)
 				&& empty(OC_Util::$core_styles)) {
 				OC_Util::$core_scripts = OC_Util::$scripts;
-			OC_Util::$scripts = array();
-			OC_Util::$core_styles = OC_Util::$styles;
-			OC_Util::$styles = array();
+				OC_Util::$scripts = array();
+				OC_Util::$core_styles = OC_Util::$styles;
+				OC_Util::$styles = array();
+			}
 		}
-	}
 		// return
-	return true;
-}
+		return true;
+	}
 
 	/**
 	 * load a single app
@@ -557,16 +557,16 @@ class OC_App{
 		$forms=array();
 		switch($type) {
 			case 'settings':
-			$source=self::$settingsForms;
-			break;
+				$source=self::$settingsForms;
+				break;
 			case 'admin':
-			$source=self::$adminForms;
-			break;
+				$source=self::$adminForms;
+				break;
 			case 'personal':
-			$source=self::$personalForms;
-			break;
+				$source=self::$personalForms;
+				break;
 			default:
-			return array();
+				return array();
 		}
 		foreach($source as $form) {
 			$forms[]=include $form;
@@ -694,15 +694,15 @@ class OC_App{
 						// OR $app['ocs_id'] == $remote['ocs_id']
 						) {
 						unset( $remoteApps[$key]);
+					}
 				}
 			}
+			$combinedApps = array_merge( $appList, $remoteApps );
+		} else {
+			$combinedApps = $appList;
 		}
-		$combinedApps = array_merge( $appList, $remoteApps );
-	} else {
-		$combinedApps = $appList;
-	}	
-	return $combinedApps;	
-}
+		return $combinedApps;
+	}
 
 	/**
 	 * @brief: get a list of all apps on apps.owncloud.com
diff --git a/lib/files/storage/common.php b/lib/files/storage/common.php
index 6935ba0095..bff5c5d57d 100644
--- a/lib/files/storage/common.php
+++ b/lib/files/storage/common.php
@@ -132,7 +132,7 @@ abstract class Common implements \OC\Files\Storage\Storage {
 			//$this->closedir( $directoryHandle ); // TODO: implement closedir in OC_FSV
 			if ( $empty == false ) {
 				if ( !$this->rmdir( $directory ) ) {
-				return false;
+					return false;
 				}
 			}
 			return true;
diff --git a/lib/migrate.php b/lib/migrate.php
index 87bdd016fe..45130be3a1 100644
--- a/lib/migrate.php
+++ b/lib/migrate.php
@@ -181,7 +181,7 @@ class OC_Migrate{
 			return json_encode( array( 'success' => false ) );
 		}
 		return json_encode( array( 'success' => true, 'data' => self::$zippath ) );
-	 }
+	}
 
 	/**
 	* @brief imports a user, or owncloud instance
diff --git a/lib/ocs.php b/lib/ocs.php
index 879aaa7668..1657f1f9d7 100644
--- a/lib/ocs.php
+++ b/lib/ocs.php
@@ -173,7 +173,7 @@ class OC_OCS {
 						}
 					}
 					xmlwriter_end_element($writer);
-					}
+				}
 				xmlwriter_end_element($writer);
 
 			}elseif($dimension=='3') {
diff --git a/lib/public/iaddressbook.php b/lib/public/iaddressbook.php
index 14943747f4..77e8750d9d 100644
--- a/lib/public/iaddressbook.php
+++ b/lib/public/iaddressbook.php
@@ -43,22 +43,22 @@ namespace OCP {
 		 * @return array of contacts which are arrays of key-value-pairs
 		 */
 		public function search($pattern, $searchProperties, $options);
-//			// dummy results
-//			return array(
-//				array('id' => 0, 'FN' => 'Thomas Müller', 'EMAIL' => 'a@b.c', 'GEO' => '37.386013;-122.082932'),
-//				array('id' => 5, 'FN' => 'Thomas Tanghus', 'EMAIL' => array('d@e.f', 'g@h.i')),
-//			);
+		//	// dummy results
+		//	return array(
+		//		array('id' => 0, 'FN' => 'Thomas Müller', 'EMAIL' => 'a@b.c', 'GEO' => '37.386013;-122.082932'),
+		//		array('id' => 5, 'FN' => 'Thomas Tanghus', 'EMAIL' => array('d@e.f', 'g@h.i')),
+		//	);
 
 		/**
 		 * @param array $properties this array if key-value-pairs defines a contact
 		 * @return array representing the contact just created or updated
 		 */
 		public function createOrUpdate($properties);
-//			// dummy
-//			return array('id'    => 0, 'FN' => 'Thomas Müller', 'EMAIL' => 'a@b.c',
-//			             'PHOTO' => 'VALUE=uri:http://www.abc.com/pub/photos/jqpublic.gif',
-//			             'ADR'   => ';;123 Main Street;Any Town;CA;91921-1234'
-//			);
+		//	// dummy
+		//	return array('id'    => 0, 'FN' => 'Thomas Müller', 'EMAIL' => 'a@b.c',
+		//		     'PHOTO' => 'VALUE=uri:http://www.abc.com/pub/photos/jqpublic.gif',
+		//		     'ADR'   => ';;123 Main Street;Any Town;CA;91921-1234'
+		//	);
 
 		/**
 		 * @return mixed