more refactor calendar callbacks