Refactoritation complete