minor refactor on dashboard_model