Refactor-Challenge

The goal of this challenge was to refactor the existing code to make it easier to read.