diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py
index 9c4e79c4c34..b46f0fc8923 100644
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@ -441,11 +441,11 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
         layout.separator()
 
         split = layout.split()
-        
+
         col = split.column()
         col.prop(md, "time")
         col.prop(md, "resolution")
-        
+
         col = split.column()
         col.prop(md, "spatial_size")
         col.prop(md, "depth")
diff --git a/release/scripts/startup/bl_ui/properties_game.py b/release/scripts/startup/bl_ui/properties_game.py
index 9a4091b4de1..2aff07bd98e 100644
--- a/release/scripts/startup/bl_ui/properties_game.py
+++ b/release/scripts/startup/bl_ui/properties_game.py
@@ -652,14 +652,15 @@ class WORLD_PT_game_physics_obstacles(WorldButtonsPanel, Panel):
         if gs.obstacle_simulation != 'NONE':
             layout.prop(gs, "level_height")
             layout.prop(gs, "show_obstacle_simulation")
-            
+
+
 class DataButtonsPanel():
     bl_space_type = 'PROPERTIES'
     bl_region_type = 'WINDOW'
     bl_context = "data"
-            
-            
-class DATA_PT_shadow_game(DataButtonsPanel, bpy.types.Panel):
+
+
+class DATA_PT_shadow_game(DataButtonsPanel, Panel):
     bl_label = "Shadow"
     COMPAT_ENGINES = {'BLENDER_GAME'}
 
@@ -669,19 +670,19 @@ class DATA_PT_shadow_game(DataButtonsPanel, bpy.types.Panel):
         lamp = context.lamp
         engine = context.scene.render.engine
         return (lamp and lamp.type in COMPAT_LIGHTS) and (engine in cls.COMPAT_ENGINES)
-        
+
     def draw_header(self, context):
         lamp = context.lamp
-        
+
         self.layout.prop(lamp, "use_shadow", text="")
 
     def draw(self, context):
         layout = self.layout
 
         lamp = context.lamp
-        
+
         layout.active = lamp.use_shadow
-        
+
         split = layout.split()
 
         col = split.column()
@@ -690,7 +691,7 @@ class DATA_PT_shadow_game(DataButtonsPanel, bpy.types.Panel):
         col = split.column()
         col.prop(lamp, "use_shadow_layer", text="This Layer Only")
         col.prop(lamp, "use_only_shadow")
-    
+
         col = layout.column()
         col.label("Buffer Type:")
         col.prop(lamp, "ge_shadow_buffer_type", text="", toggle=True)
diff --git a/release/scripts/startup/bl_ui/properties_physics_smoke.py b/release/scripts/startup/bl_ui/properties_physics_smoke.py
index d3ab616a793..012aefebb6e 100644
--- a/release/scripts/startup/bl_ui/properties_physics_smoke.py
+++ b/release/scripts/startup/bl_ui/properties_physics_smoke.py
@@ -100,7 +100,7 @@ class PHYSICS_PT_smoke(PhysicButtonsPanel, Panel):
             sub.prop(flow, "use_absolute")
             sub.prop(flow, "density")
             sub.prop(flow, "temperature")
-            
+
         elif md.smoke_type == 'COLLISION':
             coll = md.coll_settings
 
@@ -108,7 +108,6 @@ class PHYSICS_PT_smoke(PhysicButtonsPanel, Panel):
 
             col = split.column()
             col.prop(coll, "collision_type")
-        
 
 
 class PHYSICS_PT_smoke_groups(PhysicButtonsPanel, Panel):
diff --git a/release/scripts/startup/bl_ui/space_info.py b/release/scripts/startup/bl_ui/space_info.py
index 778e66bffcc..0c38829b54f 100644
--- a/release/scripts/startup/bl_ui/space_info.py
+++ b/release/scripts/startup/bl_ui/space_info.py
@@ -348,21 +348,22 @@ class INFO_MT_render(Menu):
 
         layout.operator("render.view_show")
         layout.operator("render.play_rendered_anim")
-        
-class INFO_MT_window(bpy.types.Menu):
+
+
+class INFO_MT_window(Menu):
     bl_label = "Window"
-    
+
     def draw(self, context):
         import sys
-        
+
         layout = self.layout
-        
+
         layout.operator("wm.window_duplicate")
         layout.operator("wm.window_fullscreen_toggle", icon='FULLSCREEN_ENTER')
         if sys.platform[:3] == "win":
             layout.separator()
             layout.operator("wm.console_toggle", icon='CONSOLE')
-        
+
 
 class INFO_MT_help(Menu):
     bl_label = "Help"
@@ -389,7 +390,7 @@ class INFO_MT_help(Menu):
         layout.operator("anim.update_data_paths", text="FCurve/Driver Version fix", icon='HELP')
         layout.operator("logic.texface_convert", text="TexFace to Material Convert", icon='GAME')
         layout.separator()
-        
+
         layout.operator("wm.splash", icon='BLENDER')
 
 if __name__ == "__main__":  # only for live edit.