Review feedback [wip]; routes refactor