lib/calendar: Readability and Consistency fixes