More example tidyup