More refactor to move scheduleJobs() out of service