Walker refactor