Assignment 1: Refactoring Solution