Improve left to right walk logic