Refactoring finished