Slight refactor of dashboardService