More example tidy up