adjustment after code review
Merge branch 'develop' of https://github.com/dejijaye/Calendarize into develop
code reviewed with ninja chidi