diff --git a/rhodecode/controllers/changeset.py b/rhodecode/controllers/changeset.py
--- a/rhodecode/controllers/changeset.py
+++ b/rhodecode/controllers/changeset.py
@@ -376,7 +376,8 @@ class ChangesetController(BaseRepoContro
         if comm:
             c.co = comm
             data.update(comm.get_dict())
-            data.update({'rendered_text': render('changeset/changeset_comment_block.html')})
+            data.update({'rendered_text':
+                         render('changeset/changeset_comment_block.html')})
         return data
 
     @jsonify
diff --git a/rhodecode/templates/base/root.html b/rhodecode/templates/base/root.html
--- a/rhodecode/templates/base/root.html
+++ b/rhodecode/templates/base/root.html
@@ -47,7 +47,7 @@
 
             <script type="text/javascript">
             var follow_base_url  = "${h.url('toggle_following')}";
-            
+
             //JS translations map
             var TRANSLATION_MAP = {
             	'add another comment':'${_("add another comment")}',
diff --git a/rhodecode/templates/changeset/changeset_comment_block.html b/rhodecode/templates/changeset/changeset_comment_block.html
--- a/rhodecode/templates/changeset/changeset_comment_block.html
+++ b/rhodecode/templates/changeset/changeset_comment_block.html
@@ -1,2 +1,2 @@
 <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>
-${comment.comment_block(c.co)}
\ No newline at end of file
+${comment.comment_block(c.co)}
diff --git a/rhodecode/templates/changeset/changeset_file_comment.html b/rhodecode/templates/changeset/changeset_file_comment.html
--- a/rhodecode/templates/changeset/changeset_file_comment.html
+++ b/rhodecode/templates/changeset/changeset_file_comment.html
@@ -76,7 +76,7 @@
             </div>
         %endfor
     %endfor
-    
+
 </%def>
 
 <%def name="comments(changeset)">
@@ -85,7 +85,7 @@
     <div id="inline-comments-container">
      ${inlines(changeset)}
     </div>
-    
+
     %for co in c.comments:
         ${comment_block(co)}
     %endfor
diff --git a/rhodecode/templates/files/files_ypjax.html b/rhodecode/templates/files/files_ypjax.html
--- a/rhodecode/templates/files/files_ypjax.html
+++ b/rhodecode/templates/files/files_ypjax.html
@@ -1,9 +1,9 @@
 %if c.file:
     <h3 class="files_location">
         ${_('Location')}: ${h.files_breadcrumbs(c.repo_name,c.changeset.raw_id,c.file.path)}
-        %if c.annotate:  
-        - ${_('annotation')} 
-        %endif        
+        %if c.annotate:
+        - ${_('annotation')}
+        %endif
     </h3>
         %if c.file.is_dir():
             <%include file='files_browser.html'/>