diff --git a/.rubocop.yml b/.rubocop.yml
index 14f1f7c..fbc9449 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -24,7 +24,7 @@ Style/IndentationConsistency:
   EnforcedStyle: rails
 
 Style/GuardClause:
-  MinBodyLength: 6
+  MinBodyLength: 4
 
 Style/AccessModifierIndentation:
   EnforcedStyle: outdent
diff --git a/app/controllers/problems_controller.rb b/app/controllers/problems_controller.rb
index 4f0ee46..ce18d19 100644
--- a/app/controllers/problems_controller.rb
+++ b/app/controllers/problems_controller.rb
@@ -136,9 +136,9 @@ class ProblemsController < ApplicationController
   # Redirect :back if no errors selected
   #
   protected def need_selected_problem
-    if err_ids.empty?
-      flash[:notice] = I18n.t('controllers.problems.flash.no_select_problem')
-      redirect_to :back
-    end
+    return if err_ids.any?
+
+    flash[:notice] = I18n.t('controllers.problems.flash.no_select_problem')
+    redirect_to :back
   end
 end
diff --git a/app/decorators/backtrace_line_decorator.rb b/app/decorators/backtrace_line_decorator.rb
index f576fe4..16cd69a 100644
--- a/app/decorators/backtrace_line_decorator.rb
+++ b/app/decorators/backtrace_line_decorator.rb
@@ -66,9 +66,8 @@ private
   end
 
   def link_to_hosted_javascript(app, text)
-    if app.asset_host?
-      h.link_to(text, "#{app.asset_host}/#{file_relative}", target: '_blank')
-    end
+    return unless app.asset_host?
+    h.link_to(text, "#{app.asset_host}/#{file_relative}", target: '_blank')
   end
 
   def link_to_github(app, text = nil)
diff --git a/app/helpers/problems_helper.rb b/app/helpers/problems_helper.rb
index 8bc14b3..57e75a0 100644
--- a/app/helpers/problems_helper.rb
+++ b/app/helpers/problems_helper.rb
@@ -4,10 +4,14 @@ module ProblemsHelper
   end
 
   def truncated_problem_message(problem)
-    unless (msg = problem.message).blank?
-      # Truncate & insert invisible chars so that firefox can emulate 'word-wrap: break-word' CSS rule
-      truncate(msg, length: 300, escape: false).scan(/.{1,5}/).map { |s| h(s) }.join("&#8203;").html_safe
-    end
+    msg = problem.message
+    return if msg.blank?
+
+    # Truncate & insert invisible chars so that firefox can emulate
+    # 'word-wrap: break-word' CSS rule
+    truncate(msg, length: 300, escape: false).
+      scan(/.{1,5}/).map { |s| h(s) }.
+      join("&#8203;").html_safe
   end
 
   def gravatar_tag(email, options = {})
diff --git a/app/models/app.rb b/app/models/app.rb
index ad1198a..5991bb0 100644
--- a/app/models/app.rb
+++ b/app/models/app.rb
@@ -203,12 +203,12 @@ protected
   end
 
   def check_issue_tracker
-    if issue_tracker.present?
-      issue_tracker.valid?
-      issue_tracker.errors.full_messages.each do |error|
-        errors[:base] << error
-      end if issue_tracker.errors
-    end
+    return if issue_tracker.blank?
+
+    issue_tracker.valid?
+    issue_tracker.errors.full_messages.each do |error|
+      errors[:base] << error
+    end if issue_tracker.errors
   end
 
   def normalize_github_repo
--
libgit2 0.21.2