diff --git a/cms/djangoapps/contentstore/features/discussion-editor.py b/cms/djangoapps/contentstore/features/discussion-editor.py
index fa4fb661c6..87a9c47e77 100644
--- a/cms/djangoapps/contentstore/features/discussion-editor.py
+++ b/cms/djangoapps/contentstore/features/discussion-editor.py
@@ -5,15 +5,16 @@ from lettuce import world, step
 
 
 @step('I have created a Discussion Tag$')
-def i_created_blank_common_problem(step):
+def i_created_discussion_tag(step):
     world.create_component_instance(
-        step, '.large-discussion-icon', 'i4x://edx/templates/discussion/Discussion_Tag',
+        step, '.large-discussion-icon',
+        'i4x://edx/templates/discussion/Discussion_Tag',
         '.xmodule_DiscussionModule'
     )
 
 
 @step('I see three alphabetized settings and their expected values$')
-def i_see_only_the_display_name(step):
+def i_see_only_the_settings_and_values(step):
     world.verify_all_setting_entries(
         [
             ['Category', "Week 1", True],
diff --git a/cms/djangoapps/contentstore/features/html-editor.py b/cms/djangoapps/contentstore/features/html-editor.py
index 02198a5da7..8d95ffd6b1 100644
--- a/cms/djangoapps/contentstore/features/html-editor.py
+++ b/cms/djangoapps/contentstore/features/html-editor.py
@@ -5,7 +5,7 @@ from lettuce import world, step
 
 
 @step('I have created a Blank HTML Page$')
-def i_created_blank_common_problem(step):
+def i_created_blank_html_page(step):
     world.create_component_instance(
         step, '.large-html-icon', 'i4x://edx/templates/html/Blank_HTML_Page',
         '.xmodule_HtmlModule'
diff --git a/cms/djangoapps/contentstore/features/video-editor.py b/cms/djangoapps/contentstore/features/video-editor.py
index 189e933e6f..95b151126a 100644
--- a/cms/djangoapps/contentstore/features/video-editor.py
+++ b/cms/djangoapps/contentstore/features/video-editor.py
@@ -7,7 +7,8 @@ from lettuce import world, step
 @step('I have created a Video component$')
 def i_created_a_video_component(step):
     world.create_component_instance(
-        step, '.large-video-icon', 'i4x://edx/templates/video/default',
+        step, '.large-video-icon',
+        'i4x://edx/templates/video/default',
         '.xmodule_VideoModule'
     )
 
diff --git a/cms/static/coffee/spec/views/metadata_edit_spec.coffee b/cms/static/coffee/spec/views/metadata_edit_spec.coffee
index 55ea04c739..8a72a779f4 100644
--- a/cms/static/coffee/spec/views/metadata_edit_spec.coffee
+++ b/cms/static/coffee/spec/views/metadata_edit_spec.coffee
@@ -142,7 +142,7 @@ describe "CMS.Views.Metadata.Editor creates editors for each field", ->
         })
 
 # Tests for individual views.
-assertInputType  =  (view, expectedType) ->
+assertInputType = (view, expectedType) ->
     input = view.$el.find('.setting-input')
     expect(input.length).toBe(1)
     expect(input[0].type).toBe(expectedType)
diff --git a/cms/static/coffee/src/views/module_edit.coffee b/cms/static/coffee/src/views/module_edit.coffee
index b04d333c24..e24bef3d63 100644
--- a/cms/static/coffee/src/views/module_edit.coffee
+++ b/cms/static/coffee/src/views/module_edit.coffee
@@ -126,7 +126,6 @@ class CMS.Views.ModuleEdit extends Backbone.View
 
   hideDataEditor: =>
     editorModeButtonParent =  @$el.find('#editor-mode')
-    # Can it be enough to just remove active-mode?
     editorModeButtonParent.addClass('inactive-mode')
     editorModeButtonParent.removeClass('active-mode')
     @$el.find('.wrapper-comp-settings').addClass('is-active')
diff --git a/common/lib/xmodule/xmodule/peer_grading_module.py b/common/lib/xmodule/xmodule/peer_grading_module.py
index 4fd768d63b..ca0b2ea558 100644
--- a/common/lib/xmodule/xmodule/peer_grading_module.py
+++ b/common/lib/xmodule/xmodule/peer_grading_module.py
@@ -311,14 +311,14 @@ class PeerGradingModule(PeerGradingFields, XModule):
 
         try:
             response = self.peer_gs.save_grade(location, grader_id, submission_id,
-                score, feedback, submission_key, rubric_scores, submission_flagged)
+                                               score, feedback, submission_key, rubric_scores, submission_flagged)
             return response
         except GradingServiceError:
             #This is a dev_facing_error
             log.exception("""Error saving grade to open ended grading service.  server url: {0}, location: {1}, submission_id:{2},
                             submission_key: {3}, score: {4}"""
             .format(self.peer_gs.url,
-                location, submission_id, submission_key, score)
+                    location, submission_id, submission_key, score)
             )
             #This is a student_facing_error
             return {
@@ -449,7 +449,7 @@ class PeerGradingModule(PeerGradingFields, XModule):
 
         try:
             response = self.peer_gs.save_calibration_essay(location, grader_id, calibration_essay_id,
-                submission_key, score, feedback, rubric_scores)
+                                                           submission_key, score, feedback, rubric_scores)
             if 'actual_rubric' in response:
                 rubric_renderer = combined_open_ended_rubric.CombinedOpenEndedRubric(self.system, True)
                 response['actual_rubric'] = rubric_renderer.render_rubric(response['actual_rubric'])['html']
diff --git a/common/lib/xmodule/xmodule/templates/combinedopenended/default.yaml b/common/lib/xmodule/xmodule/templates/combinedopenended/default.yaml
index 7c1ae65284..f7d639ebfb 100644
--- a/common/lib/xmodule/xmodule/templates/combinedopenended/default.yaml
+++ b/common/lib/xmodule/xmodule/templates/combinedopenended/default.yaml
@@ -34,5 +34,4 @@ data: |
   	</task>
   </combinedopenended>
 
-
 children: []