Tidy up example etc.