Calendar: code cleanup

Change-Id: I022ac45dec64b2f279a575285377ff9b954e133d