#114 Refactoring Project