diff --git a/lib/galaxy/datatypes/data.py b/lib/galaxy/datatypes/data.py
index 64a93b68a7c1..5dc33a035c0b 100644
--- a/lib/galaxy/datatypes/data.py
+++ b/lib/galaxy/datatypes/data.py
@@ -66,7 +66,6 @@ class Data( object ):
     """
     edam_data = "data_0006"
     edam_format = "format_1915"
-    edam_data = "data_0006"
     # Data is not chunkable by default.
     CHUNKABLE = False
 
diff --git a/lib/galaxy/datatypes/proteomics.py b/lib/galaxy/datatypes/proteomics.py
index 33dbebc9793d..52c581b9db64 100644
--- a/lib/galaxy/datatypes/proteomics.py
+++ b/lib/galaxy/datatypes/proteomics.py
@@ -127,7 +127,7 @@ class PepXml(ProteomicsXml):
     file_ext = "pepxml"
     blurb = 'pepXML data'
     root = "msms_pipeline_analysis"
-    
+
 
 class MzML(ProteomicsXml):
     """mzML data"""
diff --git a/lib/galaxy/datatypes/registry.py b/lib/galaxy/datatypes/registry.py
index d7494a8b8afa..85985a1cf0fc 100644
--- a/lib/galaxy/datatypes/registry.py
+++ b/lib/galaxy/datatypes/registry.py
@@ -824,18 +824,14 @@ def get_upload_metadata_params( self, context, group, tool ):
     def edam_formats( self ):
         """
         """
-        mapping = {}
-        for k, v in self.datatypes_by_extension.iteritems():
-            mapping[k] = v.edam_format
+        mapping = dict((k, v.edam_format) for k, v in self.datatypes_by_extension.items())
         return mapping
 
     @property
     def edam_data( self ):
         """
         """
-        mapping = {}
-        for k, v in self.datatypes_by_extension.iteritems():
-            mapping[k] = v.edam_data
+        mapping = dict((k, v.edam_data) for k, v in self.datatypes_by_extension.items())
         return mapping
 
     @property
diff --git a/lib/galaxy/datatypes/text.py b/lib/galaxy/datatypes/text.py
index 2acb52786877..c6ccba828fb6 100644
--- a/lib/galaxy/datatypes/text.py
+++ b/lib/galaxy/datatypes/text.py
@@ -394,7 +394,7 @@ def set_meta( self, dataset, **kwd ):
 
 
 class SnpEffDb( Text ):
-    """Class describing a SnpEff genome build"""i
+    """Class describing a SnpEff genome build"""
     edam_format = "format_3624"
     file_ext = "snpeffdb"
     MetadataElement( name="genome_version", default=None, desc="Genome Version", readonly=True, visible=True, no_value=None )