Cleaning up on the examples