improve/simplify examples