Simplify examples and minor improvements