Replaced some legacy list iterations by walkers