Tidied up examples