- Refactoring and stabilization