diff --git a/Quiz/src/jsx/App.jsx b/Quiz/src/jsx/App.jsx
index 03b20d2..fb40a24 100755
--- a/Quiz/src/jsx/App.jsx
+++ b/Quiz/src/jsx/App.jsx
@@ -40,11 +40,11 @@ class App extends React.Component {
 
      _handleSubmit() {
         if (this.state.index + 1 < this.state.numberOfQuestions) {
-                this.setState({ 
+                this.setState({
                     index : this.state.index + 1
                 })
             } else {
-                this.setState({ 
+                this.setState({
                     completed : true
                 })
             }
@@ -64,24 +64,22 @@ class App extends React.Component {
             score: (correctAnswer === selection) ? this.state.score + 1 : this.state.score,
             selectionMade:false
         })
-            
+
     }
 
 
     render() {
-        
+
         const quizCompleted =   <div>
                                     <h1> Quiz completed ! </h1>
                                 </div>;
         const quiz = <div>
-                        <Question 
-                            quiz={this.state.quiz} 
-                            index={this.state.index} />
+                        <Question question={this.state.quiz[this.state.index].question} />
                         <Answer
-                            handleRadio = {this._handleRadio} 
-                            buttonEnabled = {this.state.buttonEnabled} 
-                            selectionMade = {this.state.selectionMade}   
-                            options={this.state.quiz[this.state.index].options} 
+                            handleRadio = {this._handleRadio}
+                            buttonEnabled = {this.state.buttonEnabled}
+                            selectionMade = {this.state.selectionMade}
+                            options={this.state.quiz[this.state.index].options}
                             onClickCallback = {this._handleSubmit} />
                     </div>;
         const quizStage = !this.state.completed ? quiz : quizCompleted ;
@@ -92,10 +90,10 @@ class App extends React.Component {
                 <div className="questionWrapper" >
                     {quizStage}
                 </div>
-                
+
             </div>
         )
     }
 }
 
-export default App;
\ No newline at end of file
+export default App;
diff --git a/Quiz/src/jsx/components/Answer.jsx b/Quiz/src/jsx/components/Answer.jsx
index 1a86ebf..d0d4200 100755
--- a/Quiz/src/jsx/components/Answer.jsx
+++ b/Quiz/src/jsx/components/Answer.jsx
@@ -1,32 +1,30 @@
 import React from "react";
 
-class Answer extends React.Component{
-    constructor(props) {
-        super(props);
+const Answer = props => (
+    <form>
+        {props.options.map((option,i) => (
+            <div className={`option${i}`} key={i}>
+                <input
+                    type="radio"
+                    name='rad'
+                    id={`option_${i}`}
+                    onChange={() => {
+                        props.handleRadio(i)
+                    }}
+                />
+                <label htmlFor={`option_${i}`}>
+                    {option}
+                </label>
+            </div>
+        ))}
 
-    }
+        <input
+            type="submit"
+            className='waves-effect waves-light btn-large submit-button visible'
+            onClick={props.onClickCallback}
+            disabled={!props.selectionMade}
+        />
+    </form>
+);
 
-    render() {
-
-        const options = this.props.options.map( (option,i) => {
-                return <div className={`option${i}`} key={i}>
-                    <input type="radio" name='rad' id={`option_${i}`} onChange={this.props.handleRadio.bind(this, i)} />
-                    <label htmlFor={`option_${i}`} > {option} </label>
-                </div>
-            });
-
-        return(
-            <form onSubmit={this.props.onClickCallback}>
-                {options}
-                <input 
-                    type="submit"
-                    className='waves-effect waves-light btn-large submit-button visible'
-                    onClick={this.props.onClickCallback} 
-                    disabled={ this.props.selectionMade ? '' : 'disabled'} />
-            </form>
-        )
-    }
-}
-
-
-export default Answer;
\ No newline at end of file
+export default Answer;
diff --git a/Quiz/src/jsx/components/Question.jsx b/Quiz/src/jsx/components/Question.jsx
index 1a2604b..7981bd4 100755
--- a/Quiz/src/jsx/components/Question.jsx
+++ b/Quiz/src/jsx/components/Question.jsx
@@ -1,17 +1,12 @@
 import React from "react";
 
-const Question = (props) =>{
-
-	const QuestionObejct = props.quiz[props.index];
-
-    return( 
-        <div className="questionWrapper" >
-            <div className='questions'>
-                {QuestionObejct.question}
-            </div>
+const Question = ({question}) => (
+    <div className="questionWrapper" >
+        <div className='questions'>
+            {question}
         </div>
-    )
-}
+    </div>
+);
 
 
-export default Question;
\ No newline at end of file
+export default Question;