Cleanup example a bit