refactor: use new generic make_view functions