Calendar: Drep

Change-Id: I5387a20080e96446734124899879793203f559e8
Calendar: improve code style

Change-Id: I0f16323fdc8c2be72ac7e30e90256b434453b963