diff --git a/lib/galaxy/model/__init__.py b/lib/galaxy/model/__init__.py
index 37b07be7977..439a2120c1d 100644
--- a/lib/galaxy/model/__init__.py
+++ b/lib/galaxy/model/__init__.py
@@ -4344,6 +4344,7 @@ class HistoryDatasetCollectionAssociation(DatasetCollectionInstance,
         self.copied_from_history_dataset_collection_association = copied_from_history_dataset_collection_association
         self.implicit_output_name = implicit_output_name
         self.implicit_input_collections = implicit_input_collections
+
     @property
     def history_content_type(self):
         return "dataset_collection"
diff --git a/lib/galaxy/tools/parameters/dynamic_options.py b/lib/galaxy/tools/parameters/dynamic_options.py
index 0d4fb79478b..e8565b2db21 100644
--- a/lib/galaxy/tools/parameters/dynamic_options.py
+++ b/lib/galaxy/tools/parameters/dynamic_options.py
@@ -2,8 +2,8 @@
 Support for generating the options for a SelectToolParameter dynamically (based
 on the values of other parameters or other aspects of the current state)
 """
-from collections import OrderedDict
 import copy
+from collections import OrderedDict
 import logging
 import os
 import re