Refactor done. Scheduler controler contains all the business