refactored methods in Scheduler