Cleaned up the schedule class and stuff