diff --git a/buildout.cfg b/buildout.cfg
index 2d918f7..c893dfe 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -43,19 +43,19 @@ recipe = collective.recipe.template
 output = ${buildout:bin-directory}/update_translations
 input = inline:
     #!/usr/bin/env bash
-    
+
     DOMAIN="plone.app.discussion"
     BASE_PATH=${buildout:directory}/plone/app/discussion
     I18NDUDE=${buildout:bin-directory}/i18ndude
-    
+
     $I18NDUDE rebuild-pot --pot $BASE_PATH/locales/$DOMAIN.pot --create "$DOMAIN" $BASE_PATH*
     $I18NDUDE rebuild-pot --pot $BASE_PATH/i18n/plone.pot --create "plone" $BASE_PATH/profiles/
 
     for LANG in `find $BASE_PATH/locales -maxdepth 1 -mindepth 1 -type d \
-         | sed -e "s/.*locales\/\(.*\)$/\1/"`; do    
+         | sed -e "s/.*locales\/\(.*\)$/\1/"`; do
         $I18NDUDE sync --pot  $BASE_PATH/locales/$DOMAIN.pot $BASE_PATH/locales/de/LC_MESSAGES/$DOMAIN.po
         msgfmt --no-hash -o $BASE_PATH/locales/$LANG/LC_MESSAGES/$DOMAIN.mo  $BASE_PATH/locales/$LANG/LC_MESSAGES/$DOMAIN.po
-    
+
         $I18NDUDE sync --pot $BASE_PATH/i18n/plone.pot $BASE_PATH/i18n/plone-$LANG.po
         msgfmt --no-hash -o $BASE_PATH/i18n/plone-$LANG.mo $BASE_PATH/i18n/plone-$LANG.po
     done
diff --git a/docs/README.txt b/docs/README.txt
index e07e9b4..58475f7 100644
--- a/docs/README.txt
+++ b/docs/README.txt
@@ -1,2 +1,2 @@
-For developers documentation on plone.app.discussion, see 
+For developers documentation on plone.app.discussion, see
 http://packages.python.org/plone.app.discussion.
\ No newline at end of file
diff --git a/jenkins.cfg b/jenkins.cfg
index 209b2f4..f5b0907 100644
--- a/jenkins.cfg
+++ b/jenkins.cfg
@@ -5,11 +5,11 @@ extends =
     https://raw.github.com/plone/buildout.jenkins/master/jenkins-code-analysis.cfg
 jenkins-test-eggs = plone.app.discussion [test]
 jenkins-test-directories = plone/app/discussion
-parts += 
+parts +=
     flake8
     code-analysis
 extensions = mr.developer
-auto-checkout = 
+auto-checkout =
     plone.recipe.codeanalysis
     collective.xmltestreport
 
@@ -22,7 +22,7 @@ entry-points = flake8=flake8.main:main
 recipe = plone.recipe.codeanalysis
 
 [sources]
-plone.recipe.codeanalysis = git git://github.com/tisto/plone.recipe.codeanalysis.git pushurl=git@github.com:tisto/plone.recipe.codeanalysis.git 
+plone.recipe.codeanalysis = git git://github.com/tisto/plone.recipe.codeanalysis.git pushurl=git@github.com:tisto/plone.recipe.codeanalysis.git
 collective.xmltestreport = git git://github.com/collective/collective.xmltestreport.git
 
 [versions]
diff --git a/plone/app/discussion/browser/comments.pt b/plone/app/discussion/browser/comments.pt
index 0348f33..979b8bf 100644
--- a/plone/app/discussion/browser/comments.pt
+++ b/plone/app/discussion/browser/comments.pt
@@ -114,7 +114,7 @@
                                    />
                         </form>
 
- 
+
                         <!-- Workflow actions (e.g. 'publish') -->
                         <form name=""
                               action=""
diff --git a/plone/app/discussion/browser/javascripts/comments.js b/plone/app/discussion/browser/javascripts/comments.js
index 6e58f32..a6bd91f 100644
--- a/plone/app/discussion/browser/javascripts/comments.js
+++ b/plone/app/discussion/browser/javascripts/comments.js
@@ -48,7 +48,7 @@
         /* Fetch the reply form inside the reply div */
         var reply_form = reply_div.find("form");
 
-        /* Change the id of the textarea of the reply form 
+        /* Change the id of the textarea of the reply form
          * To avoid conflict later between textareas with same id 'form-widgets-comment-text' while implementing a seperate instance of TinyMCE
          * */
         reply_form.find('#formfield-form-widgets-comment-text').attr('id', 'formfield-form-widgets-new-textarea'+comment_id );
diff --git a/plone/app/discussion/locales/af/LC_MESSAGES/plone.app.discussion.po b/plone/app/discussion/locales/af/LC_MESSAGES/plone.app.discussion.po
index 0770096..989d1bf 100644
--- a/plone/app/discussion/locales/af/LC_MESSAGES/plone.app.discussion.po
+++ b/plone/app/discussion/locales/af/LC_MESSAGES/plone.app.discussion.po
@@ -1,5 +1,5 @@
 # JC Brand <brand@syslab.com>, 2010.
-# 
+#
 # Some tips for new translators:
 # ------------------------------
 # login: aanmeld, meld aan
@@ -7,16 +7,16 @@
 # subscribe: inteken, teken in
 # unsubscribe: uitteken, teken uit
 # subscribers: intekenaars
-# 
+#
 # Sommige mense verkies die hoflikheidsvorm "u" bo "jy/jou", en anders om.
 # Ons probeer dus maar om sover moontlik in die passiewe vorm te skryf.
 # Bv.
 # - "Attach your file" -> "Heg die lêer aan"
 # - "Afterwards you can attach your files" -> "Agterna kan lêers aangeheg
-# 
+#
 # An updateable list of Afrikaans computer terms can be found here:
 # https://wiki.ubuntu.com/AfrikaansTranslators/VertalerWoordeboek
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: plone.app.discussion\n"
diff --git a/plone/app/discussion/locales/it/LC_MESSAGES/plone.app.discussion.po b/plone/app/discussion/locales/it/LC_MESSAGES/plone.app.discussion.po
index 354a7e0..eb08564 100644
--- a/plone/app/discussion/locales/it/LC_MESSAGES/plone.app.discussion.po
+++ b/plone/app/discussion/locales/it/LC_MESSAGES/plone.app.discussion.po
@@ -1,6 +1,6 @@
 # Translation of plone.app.discussion.pot to Italian
 # Luca Fabbri <luca.fabbri@redturtle.net>, 2010
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: plone.app.discussion\n"
diff --git a/plone/app/discussion/tests/functional_test_comments.txt b/plone/app/discussion/tests/functional_test_comments.txt
index c0d1159..9712635 100644
--- a/plone/app/discussion/tests/functional_test_comments.txt
+++ b/plone/app/discussion/tests/functional_test_comments.txt
@@ -406,7 +406,7 @@ Submitting the form runs into a testbrowser notFoundException.
 We'll just catch that and check the result later.
 
     >>> try:
-    ...   form.submit()    
+    ...   form.submit()
     ... except:
     ...   pass