Refactorization completed