Lab 3 Refactoring