Tidy and improve examples