- Refactoring of code