Refactoring 10 completed