Refactorized