STY: more cleanup on examples