Refactoring towards having a non-static Scheduler class.