Refactoring in example
Updates