Calendar: code cleanup

Change-Id: Ie53e53d5da77be80abb273f9962c1fa2f26940f2