Moving two helper functions from router to walter