Calendar code cleaned up