kmaasrud refactor: improve Walker