changes post review for SchedulerServices, comments not put up
refactoring