Nicer calendar.
More cleaning.