diff --git a/projects/02_trivia_api/starter/frontend/src/components/FormView.js b/projects/02_trivia_api/starter/frontend/src/components/FormView.js
index 93ceffb566e..cd80d54d888 100755
--- a/projects/02_trivia_api/starter/frontend/src/components/FormView.js
+++ b/projects/02_trivia_api/starter/frontend/src/components/FormView.js
@@ -21,11 +21,9 @@ class FormView extends Component {
       type: "GET",
       success: (result) => {
         this.setState({ categories: result.categories })
-        return;
       },
       error: (error) => {
         alert('Unable to load categories. Please try your request again')
-        return;
       }
     })
   }
@@ -50,11 +48,9 @@ class FormView extends Component {
       crossDomain: true,
       success: (result) => {
         document.getElementById("add-question-form").reset();
-        return;
       },
       error: (error) => {
         alert('Unable to add question. Please try your request again')
-        return;
       }
     })
   }
diff --git a/projects/02_trivia_api/starter/frontend/src/components/QuestionView.js b/projects/02_trivia_api/starter/frontend/src/components/QuestionView.js
index 789814cf10e..39af34bd940 100755
--- a/projects/02_trivia_api/starter/frontend/src/components/QuestionView.js
+++ b/projects/02_trivia_api/starter/frontend/src/components/QuestionView.js
@@ -30,12 +30,11 @@ class QuestionView extends Component {
           questions: result.questions,
           totalQuestions: result.total_questions,
           categories: result.categories,
-          currentCategory: result.current_category })
-        return;
+          currentCategory: result.current_category
+        })
       },
       error: (error) => {
         alert('Unable to load questions. Please try your request again')
-        return;
       }
     })
   }
@@ -66,12 +65,11 @@ class QuestionView extends Component {
         this.setState({
           questions: result.questions,
           totalQuestions: result.total_questions,
-          currentCategory: result.current_category })
-        return;
+          currentCategory: result.current_category
+        })
       },
       error: (error) => {
         alert('Unable to load questions. Please try your request again')
-        return;
       }
     })
   }
@@ -91,12 +89,11 @@ class QuestionView extends Component {
         this.setState({
           questions: result.questions,
           totalQuestions: result.total_questions,
-          currentCategory: result.current_category })
-        return;
+          currentCategory: result.current_category
+        })
       },
       error: (error) => {
         alert('Unable to load questions. Please try your request again')
-        return;
       }
     })
   }
@@ -112,7 +109,6 @@ class QuestionView extends Component {
           },
           error: (error) => {
             alert('Unable to load questions. Please try your request again')
-            return;
           }
         })
       }
@@ -141,7 +137,7 @@ class QuestionView extends Component {
               key={q.id}
               question={q.question}
               answer={q.answer}
-              category={this.state.categories[q.category]} 
+              category={this.state.categories[q.category]}
               difficulty={q.difficulty}
               questionAction={this.questionAction(q.id)}
             />
diff --git a/projects/02_trivia_api/starter/frontend/src/components/QuizView.js b/projects/02_trivia_api/starter/frontend/src/components/QuizView.js
index 1e3b8236c80..976f8549b72 100644
--- a/projects/02_trivia_api/starter/frontend/src/components/QuizView.js
+++ b/projects/02_trivia_api/starter/frontend/src/components/QuizView.js
@@ -3,14 +3,14 @@ import $ from 'jquery';
 
 import '../stylesheets/QuizView.css';
 
-const questionsPerPlay = 5; 
+const questionsPerPlay = 5;
 
 class QuizView extends Component {
   constructor(props){
     super();
     this.state = {
         quizCategory: null,
-        previousQuestions: [], 
+        previousQuestions: [],
         showAnswer: false,
         categories: {},
         numCorrect: 0,
@@ -26,11 +26,9 @@ class QuizView extends Component {
       type: "GET",
       success: (result) => {
         this.setState({ categories: result.categories })
-        return;
       },
       error: (error) => {
         alert('Unable to load categories. Please try your request again')
-        return;
       }
     })
   }
@@ -68,11 +66,9 @@ class QuizView extends Component {
           guess: '',
           forceEnd: result.question ? false : true
         })
-        return;
       },
       error: (error) => {
         alert('Unable to load question. Please try your request again')
-        return;
       }
     })
   }
@@ -80,7 +76,7 @@ class QuizView extends Component {
   submitGuess = (event) => {
     event.preventDefault();
     const formatGuess = this.state.guess.replace(/[.,\/#!$%\^&\*;:{}=\-_`~()]/g,"").toLowerCase()
-    let evaluate =  this.evaluateAnswer()
+    const evaluate =  this.evaluateAnswer()
     this.setState({
       numCorrect: !evaluate ? this.state.numCorrect : this.state.numCorrect + 1,
       showAnswer: true,
@@ -90,7 +86,7 @@ class QuizView extends Component {
   restartGame = () => {
     this.setState({
       quizCategory: null,
-      previousQuestions: [], 
+      previousQuestions: [],
       showAnswer: false,
       numCorrect: 0,
       currentQuestion: {},
@@ -138,7 +134,7 @@ class QuizView extends Component {
 
   renderCorrectAnswer(){
     const formatGuess = this.state.guess.replace(/[.,\/#!$%\^&\*;:{}=\-_`~()]/g,"").toLowerCase()
-    let evaluate =  this.evaluateAnswer()
+    const evaluate =  this.evaluateAnswer()
     return(
       <div className="quiz-play-holder">
         <div className="quiz-question">{this.state.currentQuestion.question}</div>
@@ -152,7 +148,7 @@ class QuizView extends Component {
   renderPlay(){
     return this.state.previousQuestions.length === questionsPerPlay || this.state.forceEnd
       ? this.renderFinalScore()
-      : this.state.showAnswer 
+      : this.state.showAnswer
         ? this.renderCorrectAnswer()
         : (
           <div className="quiz-play-holder">