Changed schedule usage to remove closures