diff --git a/lib/additionals/patches/issue_patch.rb b/lib/additionals/patches/issue_patch.rb
index 86ff66a7..c3203a83 100644
--- a/lib/additionals/patches/issue_patch.rb
+++ b/lib/additionals/patches/issue_patch.rb
@@ -106,14 +106,10 @@ module Additionals
       end
 
       def status_x_affected?(new_status_id)
-        return false unless Additionals.setting?(:issue_current_user_status)
+        return false unless Additionals.setting? :issue_current_user_status
         return false if Additionals.setting(:issue_assign_to_x).blank?
 
-        if Additionals.setting(:issue_assign_to_x).include?(new_status_id.to_s)
-          true
-        else
-          false
-        end
+        Additionals.setting(:issue_assign_to_x).include? new_status_id.to_s
       end
 
       private
diff --git a/lib/additionals/wiki_macros/vimeo_macro.rb b/lib/additionals/wiki_macros/vimeo_macro.rb
index 967ba04b..77653385 100644
--- a/lib/additionals/wiki_macros/vimeo_macro.rb
+++ b/lib/additionals/wiki_macros/vimeo_macro.rb
@@ -21,12 +21,7 @@ module Additionals
 
         width = options[:width].presence || 640
         height = options[:height].presence || 360
-
-        autoplay = if !options[:autoplay].nil? && Additionals.true?(options[:autoplay])
-                     true
-                   else
-                     false
-                   end
+        autoplay = !options[:autoplay].nil? && Additionals.true?(options[:autoplay])
 
         raise 'The correct usage is {{vimeo(<video key>[, width=x, height=y])}}' if args.empty?
 
diff --git a/lib/additionals/wiki_macros/youtube_macro.rb b/lib/additionals/wiki_macros/youtube_macro.rb
index a93967d8..fe2e434e 100644
--- a/lib/additionals/wiki_macros/youtube_macro.rb
+++ b/lib/additionals/wiki_macros/youtube_macro.rb
@@ -21,12 +21,7 @@ module Additionals
 
         width = options[:width].presence || 640
         height = options[:height].presence || 360
-
-        autoplay = if !options[:autoplay].nil? && Additionals.true?(options[:autoplay])
-                     true
-                   else
-                     false
-                   end
+        autoplay = !options[:autoplay].nil? && Additionals.true?(options[:autoplay])
 
         raise 'The correct usage is {{youtube(<video key>[, width=x, height=y])}}' if args.empty?