diff --git a/ProjectClock/AlarmActivationLogic.swift b/ProjectClock/AlarmActivationLogic.swift
index cae9d45..1227e16 100644
--- a/ProjectClock/AlarmActivationLogic.swift
+++ b/ProjectClock/AlarmActivationLogic.swift
@@ -26,15 +26,3 @@ func shakeAction() {
         }
     }
 }
-
-// Handles the core logic behind the factoring alarm
-func factorAction(puzzleQuestionLabel: UILabel) -> [Int] {
-    let problem = QuadraticProb()
-    
-    let answer = problem.getAnswer()
-    let problemString = problem.getProblem()
-    
-    puzzleQuestionLabel.text = "Solve: \(problemString)"
-    print("Answer: \(answer)")
-    return answer
-}
diff --git a/ProjectClock/AlarmActivationViewController.swift b/ProjectClock/AlarmActivationViewController.swift
index a9eae6c..3a88067 100644
--- a/ProjectClock/AlarmActivationViewController.swift
+++ b/ProjectClock/AlarmActivationViewController.swift
@@ -90,7 +90,7 @@ class AlarmActivationViewController: UIViewController
             switch alarm.wakeMethod.name
             {
             case "Factor":
-                self.puzzleAnswers = factorAction(puzzleQuestionLabel: puzzleQuestionLabel)
+                initFactorProblem()
                 puzzleView.show()
             case "RPS":
                 rpsView.show()
@@ -105,17 +105,26 @@ class AlarmActivationViewController: UIViewController
             }
         }
     }
+    
+    func initFactorProblem()
+    {
+        let problem = QuadraticProb()
+        puzzleAnswers = problem.getAnswer()
+        
+        puzzleQuestionLabel.text = "Solve: \(problem.getProblem())"
+        print("Answer: \(puzzleAnswers)")
+    }
    
     /**
      Verfies and ends factoring WVM
      */
-    @IBAction func checkBinomialSolution(_ sender: Any) {
-        if let input = puzzleAnswerInput.text {
-            if let numericalInput = Int(input) {
-                if puzzleAnswers.contains(numericalInput) {
-                    endAlarm()
-                }
-            }
+    @IBAction func checkBinomialSolution(_ sender: Any)
+    {
+        if let input = puzzleAnswerInput.text,
+           let numericalInput = Int(input),
+           puzzleAnswers.contains(numericalInput)
+        {
+            endAlarm()
         }
     }
     
@@ -124,8 +133,7 @@ class AlarmActivationViewController: UIViewController
      */
     @IBAction func rpsChoice(_ sender: UIButton)
     {
-        let rps = RPS()
-        if rps.playRPS(you: [.rock, .paper, .scissors][sender.tag], computer: RPS.choices.randomElement()!)
+        if RPS.playRPS(you: [.rock, .paper, .scissors][sender.tag], computer: RPS.choices.randomElement()!)
         {
             endAlarm()
         }
diff --git a/ProjectClock/MathExpressions.swift b/ProjectClock/MathExpressions.swift
index 765a70e..a1e6c1f 100644
--- a/ProjectClock/MathExpressions.swift
+++ b/ProjectClock/MathExpressions.swift
@@ -171,7 +171,7 @@ class RPS
         case scissors = "Scissors"
     }
     
-    func playRPS(you: Choice, computer: Choice) -> Bool
+    static func playRPS(you: Choice, computer: Choice) -> Bool
     {
         return you == .rock && computer == .scissors ||
             you == .paper && computer == .rock ||