jrl-walkgen-refactoring