Refactor calendar method arguments