Js #28 scheduler refactoring