Calendar: reformatting code
Calendar: reformatting code
Updated helper
Calendar: updated config validation
Merge remote-tracking branch 'origin/master'