Refactoring: general cleaning
Add a code example