362 Refactoring Project