Assignment 1: Refactoring (for TCSS 490)