Cleanup walk example a bit