Refactoring
Example improved