[ticket/258] Slightly improve calendar code and update copyright

B3P-258