Rename sender to scheduler
Cosmetic and update comments