Realized an opportunity for refactoring, AND TOOK IT!