Extending the example a bit
Refactor: better naming