Cleaning up the examples a bit