minor refactoring of schedule model