Refactoring ended