ENH: refactor example + address discussion