diff --git a/app/helpers/comments_helper.rb b/app/helpers/comments_helper.rb
index 67c347ced..0f8eca926 100644
--- a/app/helpers/comments_helper.rb
+++ b/app/helpers/comments_helper.rb
@@ -17,4 +17,23 @@ module CommentsHelper
     comments.select{|c| c.parent_id == parent.id}
   end
 
+  def user_level_class(comment)
+    if comment.as_administrator?
+      "is-admin"
+    elsif comment.as_moderator?
+      "is-moderator"
+    elsif comment.user.official?
+      "level-#{comment.user.official_level}"
+    else
+      "" # Default no special user class
+    end
+  end
+
+  def comment_author_class(comment, author_id)
+    if comment.user_id == author_id
+      "is-author"
+    else
+      "" # Default not author class
+    end
+  end
 end
diff --git a/app/views/comments/_comment.html.erb b/app/views/comments/_comment.html.erb
index e2ce326aa..c353fb499 100644
--- a/app/views/comments/_comment.html.erb
+++ b/app/views/comments/_comment.html.erb
@@ -62,19 +62,12 @@
             &nbsp;&bull;&nbsp;<time><%= l comment.created_at.to_datetime, format: :datetime %></time>
           </div>
 
-          <% if comment.as_administrator? %>
-            <div class="comment-user is-admin"><%= simple_format text_with_links comment.body %></div>
-          <% elsif comment.as_moderator? %>
-            <div class="comment-user is-moderator"><%= simple_format text_with_links comment.body %></div>
-          <% elsif comment.user.official? && comment.user_id == @commentable.author_id %>
-            <div class="comment-user level-<%= comment.user.official_level %> is-author"><%= simple_format text_with_links comment.body %></div>
-          <% elsif comment.user.official? %>
-            <div class="comment-user level-<%= comment.user.official_level %>"><%= simple_format text_with_links comment.body %></div>
-          <% elsif comment.user_id == @commentable.author_id %>
-            <div class="comment-user is-author"><%= simple_format text_with_links comment.body %></div>
-          <% else %>
-            <div class="comment-user"><%= simple_format text_with_links comment.body %></div>
-          <% end %>
+          <div class="comment-user
+                    <%= user_level_class comment %>
+                    <%= comment_author_class comment, @commentable.author_id %>">
+            <%= text_with_links comment.body %>
+          </div>
+
           <span id="<%= dom_id(comment) %>_votes" class="comment-votes right">
             <%= render 'comments/votes', comment: comment %>
           </span>