Address review comments regarding scheduling order & minor rewords