diff --git a/add_mesh_extra_objects/add_mesh_supertoroid.py b/add_mesh_extra_objects/add_mesh_supertoroid.py
index 0be6a89b4a2cfdd253eabaf7ef015adb836daa73..73af675cf8192a3c3039f894372f603b1328cf83 100644
--- a/add_mesh_extra_objects/add_mesh_supertoroid.py
+++ b/add_mesh_extra_objects/add_mesh_supertoroid.py
@@ -1,14 +1,14 @@
 '''
 bl_addon_info = {
-    'name': 'Add Mesh: SuperToroid',
-    'author': 'DreamPainter',
-    'version': '1',
-    'blender': (2, 5, 3),
-    'location': 'View3D > Add > Mesh > SuperToroid',
-    'description': 'Add a SuperToroid mesh',
-    'url': 'http://wiki.blender.org/index.php/Extensions:2.5/Py/' \
-        'Scripts/Add_Mesh/',  # no url
-    'category': 'Add Mesh'}
+    "name": "Add Mesh: SuperToroid",
+    "author": "DreamPainter",
+    "version": (1, 0, 0),
+    "blender": (2, 5, 3),
+    "location": "View3D > Add > Mesh > SuperToroid",
+    "description": "Add a SuperToroid mesh",
+    "url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/" \
+        "Scripts/Add_Mesh/",  # no url
+    "category": "Add Mesh"}
 '''
 import bpy
 from bpy.props import FloatProperty,BoolProperty,IntProperty
diff --git a/io_anim_acclaim/__init__.py b/io_anim_acclaim/__init__.py
index be8ce5b6bdc5936cb26eb29118873f63a3275abf..b19b66568733250ee0834352fc68f3195347ee60 100644
--- a/io_anim_acclaim/__init__.py
+++ b/io_anim_acclaim/__init__.py
@@ -23,17 +23,17 @@
 
 
 bl_info = {
-    'name': "Acclaim Motion Capture Files (.asf, .amc)",
-    'author': "Daniel Monteiro Basso <daniel@basso.inf.br>",
-    'version': (2012, 2, 29, 1),
-    'blender': (2, 6, 2),
-    'location': "File > Import-Export",
-    'description': "Imports Acclaim Skeleton and Motion Capture Files",
-    'wiki_url': "http://wiki.blender.org/index.php/Extensions:2.6/Py/"
+    "name": "Acclaim Motion Capture Files (.asf, .amc)",
+    "author": "Daniel Monteiro Basso <daniel@basso.inf.br>",
+    "version": (2012, 2, 29, 1),
+    "blender": (2, 6, 2),
+    "location": "File > Import-Export",
+    "description": "Imports Acclaim Skeleton and Motion Capture Files",
+    "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.6/Py/"
                 "Scripts/Import-Export/Acclaim_Importer",
-    'tracker_url': "http://projects.blender.org/tracker/index.php?"
+    "tracker_url": "http://projects.blender.org/tracker/index.php?"
                    "func=detail&aid=27127&group_id=153&atid=467",
-    'category': 'Import-Export'}
+    "category": "Import-Export"}
 
 
 import re
diff --git a/io_anim_c3d/__init__.py b/io_anim_c3d/__init__.py
index 8741c2527b82ead3b53b0f0356534158d007d850..1c5922e869d957707e38fae457f9785067a5ef49 100644
--- a/io_anim_c3d/__init__.py
+++ b/io_anim_c3d/__init__.py
@@ -23,17 +23,17 @@
 
 
 bl_info = {
-    'name': "C3D Graphics Lab Motion Capture file (.c3d)",
-    'author': "Daniel Monteiro Basso <daniel@basso.inf.br>",
-    'version': (2012, 7, 11, 1),
-    'blender': (2, 6, 3),
-    'location': "File > Import",
-    'description': "Imports C3D Graphics Lab Motion Capture files",
-    'wiki_url': "http://wiki.blender.org/index.php/Extensions:2.6/Py/"
+    "name": "C3D Graphics Lab Motion Capture file (.c3d)",
+    "author": "Daniel Monteiro Basso <daniel@basso.inf.br>",
+    "version": (2012, 7, 11, 1),
+    "blender": (2, 6, 3),
+    "location": "File > Import",
+    "description": "Imports C3D Graphics Lab Motion Capture files",
+    "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.6/Py/"
                 "Scripts/Import-Export/C3D_Importer",
-    'tracker_url': "http://projects.blender.org/tracker/?func=detail&atid=467"
+    "tracker_url": "http://projects.blender.org/tracker/?func=detail&atid=467"
                    "&aid=29061&group_id=153",
-    'category': 'Import-Export'}
+    "category": 'Import-Export'}
 
 
 import bpy
diff --git a/io_export_after_effects.py b/io_export_after_effects.py
index a71348a3c3454fe86148bb70f0d936e5f0f4d433..bfeee152c35ae90dab34ba79af76b528687cc2d1 100644
--- a/io_export_after_effects.py
+++ b/io_export_after_effects.py
@@ -19,18 +19,18 @@
 # <pep8 compliant>
 
 bl_info = {
-    'name': 'Export: Adobe After Effects (.jsx)',
-    'description': 'Export cameras, selected objects & camera solution 3D Markers to Adobe After Effects CS3 and above',
-    'author': 'Bartek Skorupa',
-    'version': (0, 6, 3),
-    'blender': (2, 6, 2),
-    'location': 'File > Export > Adobe After Effects (.jsx)',
+    "name": "Export: Adobe After Effects (.jsx)",
+    "description": "Export cameras, selected objects & camera solution 3D Markers to Adobe After Effects CS3 and above",
+    "author": "Bartek Skorupa",
+    "version": (0, 6, 3),
+    "blender": (2, 6, 2),
+    "location": "File > Export > Adobe After Effects (.jsx)",
     "warning": "",
     "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.6/Py/"\
         "Scripts/Import-Export/Adobe_After_Effects",
     "tracker_url": "https://projects.blender.org/tracker/index.php?"\
         "func=detail&aid=29858",
-    'category': 'Import-Export',
+    "category": "Import-Export",
     }
 
 
diff --git a/io_import_scene_dxf.py b/io_import_scene_dxf.py
index f0cc671e24968915e66bdf2d4cc567c8265c23c1..2547a49c5dda97444f88e8505916556d080a9e8e 100644
--- a/io_import_scene_dxf.py
+++ b/io_import_scene_dxf.py
@@ -17,19 +17,19 @@
 # ##### END GPL LICENSE BLOCK #####
 
 bl_info = {
-    'name': 'Import Autocad DXF Format (.dxf)',
-    'author': 'Thomas Larsson, Remigiusz Fiedler',
-    'version': (0, 1, 6),
-    'blender': (2, 6, 3),
-    'location': 'File > Import > Autocad (.dxf)',
-    'description': 'Import files in the Autocad DXF format (.dxf)',
-    'warning': 'Under construction! Visit Wiki for details.',
-    'wiki_url': 'http://wiki.blender.org/index.php/Extensions:2.6/Py/'\
-        'Scripts/Import-Export/DXF_Importer',
-    'tracker_url': 'https://projects.blender.org/tracker/index.php?'\
-        'func=detail&aid=23480',
-    'support': 'OFFICIAL',
-    'category': 'Import-Export',
+    "name": "Import Autocad DXF Format (.dxf)",
+    "author": "Thomas Larsson, Remigiusz Fiedler",
+    "version": (0, 1, 6),
+    "blender": (2, 6, 3),
+    "location": "File > Import > Autocad (.dxf)",
+    "description": "Import files in the Autocad DXF format (.dxf)",
+    "warning": "Under construction! Visit Wiki for details.",
+    "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.6/Py/"
+                "Scripts/Import-Export/DXF_Importer",
+    "tracker_url": "https://projects.blender.org/tracker/index.php?"
+                   "func=detail&aid=23480",
+    "support": "OFFICIAL",
+    "category": "Import-Export",
     }
 
 """
diff --git a/io_scene_obj/import_obj.py b/io_scene_obj/import_obj.py
index 3a85af263c4709aea7406c7540a9f9ac4628e0c1..f9d754314849bb5e6e9dfc1aeebdd69bc07c20d7 100644
--- a/io_scene_obj/import_obj.py
+++ b/io_scene_obj/import_obj.py
@@ -1171,15 +1171,3 @@ def load(operator, context, filepath,
 
     print("finished importing: %r in %.4f sec." % (filepath, (time_new - time_main)))
     return {'FINISHED'}
-
-
-# NOTES (all line numbers refer to 2.4x import_obj.py, not this file)
-# check later: line 489
-# can convert now: edge flags, edges: lines 508-528
-# ngon (uses python module BPyMesh): 384-414
-# NEXT clamp size: get bound box with RNA
-# get back to l 140 (here)
-# search image in bpy.config.textureDir - load_image
-# replaced BPyImage.comprehensiveImageLoad with a simplified version that only checks additional directory specified, but doesn't search dirs recursively (obj_image_load)
-# bitmask won't work? - 132
-# uses bpy.sys.time()
diff --git a/light_field_tools/__init__.py b/light_field_tools/__init__.py
index cabdd35eb81284c3a16fc997fc98519f3c30fe57..0c47b7aecc00399c70b139e0695f343fd47ffa9e 100644
--- a/light_field_tools/__init__.py
+++ b/light_field_tools/__init__.py
@@ -18,16 +18,16 @@
 
 
 bl_info = {
-    'name': 'Light Field Tools',
-    'author': 'Aurel Wildfellner',
-    'description': 'Tools to create a light field camera and projector',
-    'version': (0, 3, 0),
-    'blender': (2, 6, 4),
-    'location': 'View3D > Tool Shelf > Light Field Tools',
-    'url': 'http://www.jku.at/cg/',
+    "name": "Light Field Tools",
+    "author": "Aurel Wildfellner",
+    "description": "Tools to create a light field camera and projector",
+    "version": (0, 3, 0),
+    "blender": (2, 6, 4),
+    "location": "View3D > Tool Shelf > Light Field Tools",
+    "url": "http://www.jku.at/cg/",
     "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.6/Py/Scripts/Render/Light_Field_Tools",
     "tracker_url": "http://projects.blender.org/tracker/index.php?func=detail&aid=25719",
-    'category': 'Render'
+    "category": "Render"
 }
 
 
diff --git a/mesh_looptools.py b/mesh_looptools.py
index 81f972cf53f17ac741ddca8ac7f1e80d18cdf780..5b0a6e636879aeb86af55553cc066aec9d1a23ad 100644
--- a/mesh_looptools.py
+++ b/mesh_looptools.py
@@ -17,18 +17,18 @@
 # ##### END GPL LICENSE BLOCK #####
 
 bl_info = {
-    'name': "LoopTools",
-    'author': "Bart Crouch",
-    'version': (4, 2, 0),
-    'blender': (2, 6, 3),
-    'location': "View3D > Toolbar and View3D > Specials (W-key)",
-    'warning': "",
-    'description': "Mesh modelling toolkit. Several tools to aid modelling",
-    'wiki_url': "http://wiki.blender.org/index.php/Extensions:2.6/Py/"\
-        "Scripts/Modeling/LoopTools",
-    'tracker_url': "http://projects.blender.org/tracker/index.php?"\
-        "func=detail&aid=26189",
-    'category': 'Mesh'}
+    "name": "LoopTools",
+    "author": "Bart Crouch",
+    "version": (4, 2, 0),
+    "blender": (2, 6, 3),
+    "location": "View3D > Toolbar and View3D > Specials (W-key)",
+    "warning": "",
+    "description": "Mesh modelling toolkit. Several tools to aid modelling",
+    "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.6/Py/"
+                "Scripts/Modeling/LoopTools",
+    "tracker_url": "http://projects.blender.org/tracker/index.php?"
+                   "func=detail&aid=26189",
+    "category": "Mesh"}
 
 
 import bmesh
diff --git a/space_view3d_copy_attributes.py b/space_view3d_copy_attributes.py
index ecc12b92269641db447f6b2cbae4103675ab8b68..bd8f70a642aa68a0a6c315b1143d5562ad852104 100644
--- a/space_view3d_copy_attributes.py
+++ b/space_view3d_copy_attributes.py
@@ -19,17 +19,17 @@
 # <pep8 compliant>
 
 bl_info = {
-    'name': 'Copy Attributes Menu',
-    'author': 'Bassam Kurdali, Fabian Fricke, Adam Wiseman',
-    'version': (0, 4, 7),
-    'blender': (2, 6, 3),
-    'location': 'View3D > Ctrl-C',
-    'description': 'Copy Attributes Menu from Blender 2.4',
-    'wiki_url': 'http://wiki.blender.org/index.php/Extensions:2.6/Py/'
-                'Scripts/3D_interaction/Copy_Attributes_Menu',
-    'tracker_url': 'https://projects.blender.org/tracker/index.php?'
-                   'func=detail&aid=22588',
-    'category': '3D View'}
+    "name": "Copy Attributes Menu",
+    "author": "Bassam Kurdali, Fabian Fricke, Adam Wiseman",
+    "version": (0, 4, 7),
+    "blender": (2, 6, 3),
+    "location": "View3D > Ctrl-C",
+    "description": "Copy Attributes Menu from Blender 2.4",
+    "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.6/Py/"
+                "Scripts/3D_interaction/Copy_Attributes_Menu",
+    "tracker_url": "https://projects.blender.org/tracker/index.php?"
+                   "func=detail&aid=22588",
+    "category": "3D View"}
 
 import bpy
 from mathutils import Matrix
diff --git a/space_view3d_screencast_keys.py b/space_view3d_screencast_keys.py
index 09989e731bb19d9cb0ae4852a4835426de39ab1d..88fd191ef0a4cf4c03c6b8a3696737b24324e42b 100644
--- a/space_view3d_screencast_keys.py
+++ b/space_view3d_screencast_keys.py
@@ -19,19 +19,19 @@
 # <pep8 compliant>
 
 bl_info = {
-    'name': "Screencast Keys",
-    'author': 'Paulo Gomes, Bart Crouch, John E. Herrenyo, Gaia Clary, Pablo Vazquez',
-    'version': (1, 7),
-    'blender': (2, 6, 4),
-    'location': '3D View > Properties Panel > Screencast Keys',
-    'warning': '',
-    'description': 'Display keys pressed in the 3D View, '\
-        'useful for screencasts.',
-    'wiki_url': 'http://wiki.blender.org/index.php/Extensions:2.6/'
-                'Py/Scripts/3D_interaction/Screencast_Key_Status_Tool',
-    'tracker_url': 'http://projects.blender.org/tracker/index.php?'
-                   'func=detail&aid=21612',
-    'category': '3D View'}
+    "name": "Screencast Keys",
+    "author": "Paulo Gomes, Bart Crouch, John E. Herrenyo, Gaia Clary, Pablo Vazquez",
+    "version": (1, 7),
+    "blender": (2, 6, 4),
+    "location": "3D View > Properties Panel > Screencast Keys",
+    "warning": "",
+    "description": "Display keys pressed in the 3D View, "
+                   "useful for screencasts.",
+    "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.6/"
+                "Py/Scripts/3D_interaction/Screencast_Key_Status_Tool",
+    "tracker_url": "http://projects.blender.org/tracker/index.php?"
+                   "func=detail&aid=21612",
+    "category": "3D View"}
 
 import bgl
 import blf