Refactoring Project