Finished refactoring process