modified class calendar, removed global variables