Did some code simplifications in Schedule,  and moved a method in Schedule to Day because it made more sense in that class