Refactor scheduler

Same result compared to master

Merge request reports

Loading