Refactor arguments for calendar methods