Example updated for adequating the full class refactoring