cleaning up examples a bit more