calendar: comment our more stuffs and refactoring