diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 2e6848374..896a21de9 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -12,32 +12,33 @@
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
+        android:name=".android.Application"
         android:debuggable="true"
         android:icon="@drawable/or_launcher"
         android:killAfterRestore="true"
-        android:label="@string/app_name"
-        android:name=".android.Application" >
+        android:label="@string/app_name" >
         <activity
             android:name=".android.Main"
             android:theme="@android:style/Theme.Black.NoTitleBar" >
-            <intent-filter >
+            <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <activity
-            android:label="@string/app_name"
-            android:name=".android.rocket.OpenRocketViewer" >
+            android:name=".android.rocket.OpenRocketViewer"
+            android:label="@string/app_name" >
 
             <!--
                  I don't understand why I need to have two different intent filters. 
 				Combining the <data> elements into a single field did not result in a working 
 				application. The first intent-filter (with mimeType wildcard) convinces the 
 				file browser to associate the correct launcher icon. the second intent-filter 
-				is actually invoked when a file is selected.

+				is actually invoked when a file is selected.


             -->
-            <intent-filter >
+            <!-- this intent filter convinces the file browser to display icons -->
+            <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
                 <category android:name="android.intent.category.DEFAULT" />
@@ -48,7 +49,8 @@
                     android:pathPattern=".*\\.ork"
                     android:scheme="file" />
             </intent-filter>
-            <intent-filter >
+            <!-- this intent is sent when a file is selected in file browser -->
+            <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
                 <category android:name="android.intent.category.DEFAULT" />
@@ -60,19 +62,19 @@
             </intent-filter>
         </activity>
         <activity android:name=".android.PreferencesActivity" >
-            <intent-filter >
+            <intent-filter>
                 <action android:name="net.sf.openrocket.android.PreferencesActivity" />
 
                 <category android:name="android.intent.category.PREFERENCE" />
             </intent-filter>
         </activity>
         <activity
-            android:label="@string/MotorListTitle"
-            android:name=".android.motor.MotorHierarchicalBrowser" />
+            android:name=".android.motor.MotorHierarchicalBrowser"
+            android:label="@string/MotorListTitle" />
         <activity android:name=".android.motor.MotorDetails" />
         <activity
-            android:label="@string/MotorListTitle"
-            android:name=".android.thrustcurve.TCQueryActivity" />
+            android:name=".android.thrustcurve.TCQueryActivity"
+            android:label="@string/MotorListTitle" />
         <activity android:name=".android.simulation.SimulationViewer" />
         <activity android:name=".android.simulation.GraphicalActivity" />
     </application>