change structure of calendar list
code cleanup