minor cleanup, working on adding multiple calendar support