Refactoring complete