- Refactor code