CalendarViews: Merge with f192b4ecdc cleanups
add comments what should be done in future and make code better readable.