Refactoring is continuing