Refactorization Complete