Refactoring week4 project