refactoring project 100%