Calendar code cleanup (for what it's worth)
Calendar code cleanup (for what it's worth)

simonvanderveldt/homA,simonvanderveldt/homA,binarybucks/homA,binarybucks/homA,binarybucks/homA,binarybucks/homA,binarybucks/homA,binarybucks/homA,simonvanderveldt/homA