* Update calendar logic to accomodate for months starting on Sunday

* Apply suggestions from code review

---------
Co-authored-by: boojack <stevenlgtm@gmail.com>