#121 cleaned up Scheduler interface