Slight clean up of the examples