Changes to schedules based on comments by Mike
Merge pull request #238 from alxdarksage/refactor-schedules

Changes to schedules based on comments by Mike