diff --git a/app/controllers/assignments_controller.rb b/app/controllers/assignments_controller.rb
index fd6ef0725d..cfc26f3067 100644
--- a/app/controllers/assignments_controller.rb
+++ b/app/controllers/assignments_controller.rb
@@ -235,7 +235,8 @@ def update
     rescue SubmissionRule::InvalidRuleType => e
       @assignment.errors.add(:base, t('assignment.error', message: e.message))
       flash[:error] = t('assignment.error', message: e.message)
-      render :edit, id: @assignment.id and return
+      render :edit, id: @assignment.id
+      return
     end
 
     if @assignment.save
diff --git a/app/models/submission_rule.rb b/app/models/submission_rule.rb
index c3a6db7220..e7afe00dd6 100644
--- a/app/models/submission_rule.rb
+++ b/app/models/submission_rule.rb
@@ -15,10 +15,10 @@ def initialize(rule_name)
 #  validates_presence_of :assignment
 
   def self.descendants
-    [ NoLateSubmissionRule,
-      PenaltyPeriodSubmissionRule,
-      PenaltyDecayPeriodSubmissionRule,
-      GracePeriodSubmissionRule ]
+    [NoLateSubmissionRule,
+     PenaltyPeriodSubmissionRule,
+     PenaltyDecayPeriodSubmissionRule,
+     GracePeriodSubmissionRule]
   end
 
   def can_collect_now?