Much tidying of examples