RF: refactor the example