Please take a look at each commit

If you take a look at each commit, you'll see how I refactored your code step by step. Feel free to email me with any questions.