Lab 6 - Refactoring