Refactoring 75%