Clean up example code a bit