* Refactored some code to match the solutions video