diff --git a/CHANGES.rst b/CHANGES.rst
index d352d62..01ea409 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -20,6 +20,9 @@ Bug fixes:
 - Improve English on a couple of field descriptions
   [djowett]
 
+- Fix some easy pep8 issues
+  [djowett]
+
 
 2.4.19 (2017-01-02)
 -------------------
diff --git a/plone/app/discussion/browser/captcha.py b/plone/app/discussion/browser/captcha.py
index 50a11a0..ffbda2f 100644
--- a/plone/app/discussion/browser/captcha.py
+++ b/plone/app/discussion/browser/captcha.py
@@ -65,3 +65,5 @@ class CaptchaExtender(extensible.FormExtender):
                 self.form.fields['captcha'].widgetFactory = NorobotsFieldWidget
             else:
                 self.form.fields['captcha'].mode = interfaces.HIDDEN_MODE
+
+
diff --git a/plone/app/discussion/browser/controlpanel.py b/plone/app/discussion/browser/controlpanel.py
index 4bb3ba0..65bcce7 100644
--- a/plone/app/discussion/browser/controlpanel.py
+++ b/plone/app/discussion/browser/controlpanel.py
@@ -125,7 +125,8 @@ class DiscussionSettingsControlPanel(controlpanel.ControlPanelFormWrapper):
             output.append('globally_enabled')
 
         # Comment moderation
-        one_state_worklow_disabled = 'comment_one_state_workflow' not in workflow_chain
+        one_state_worklow_disabled = \
+            'comment_one_state_workflow' not in workflow_chain
         comment_review_workflow_disabled = \
             'comment_review_workflow' not in workflow_chain
         if one_state_worklow_disabled and comment_review_workflow_disabled:
@@ -174,7 +175,8 @@ class DiscussionSettingsControlPanel(controlpanel.ControlPanelFormWrapper):
         """
         wftool = getToolByName(self.context, 'portal_workflow', None)
         workflow_chain = wftool.getChainForPortalType('Discussion Item')
-        one_state_workflow_enabled = 'comment_one_state_workflow' in workflow_chain
+        one_state_workflow_enabled = \
+            'comment_one_state_workflow' in workflow_chain
         comment_review_workflow_enabled = \
             'comment_review_workflow' in workflow_chain
         if one_state_workflow_enabled or comment_review_workflow_enabled:
diff --git a/plone/app/discussion/comment.py b/plone/app/discussion/comment.py
index 6f2c04b..92c1c50 100644
--- a/plone/app/discussion/comment.py
+++ b/plone/app/discussion/comment.py
@@ -207,6 +207,7 @@ class Comment(CatalogAware, WorkflowAware, DynamicType, Traversable,
     def opaqueValues(self):  # pragma: no cover
         return []
 
+
 CommentFactory = Factory(Comment)
 
 
diff --git a/plone/app/discussion/tests/test_controlpanel.py b/plone/app/discussion/tests/test_controlpanel.py
index 4c09594..c3f1ac5 100644
--- a/plone/app/discussion/tests/test_controlpanel.py
+++ b/plone/app/discussion/tests/test_controlpanel.py
@@ -163,7 +163,8 @@ class ConfigurationChangedSubscriberTest(unittest.TestCase):
            the 'comment_moderation' setting in the discussion control panel
            changes.
         """
-        # By default the comment_one_state_workflow without moderation is enabled
+        # By default the comment_one_state_workflow without moderation is 
+        # enabled
         self.assertEqual(
             ('comment_one_state_workflow',),
             self.portal.portal_workflow.getChainForPortalType(