refactor - before remove comments
refactor of main script
Merge branch 'feature/calendar-refactor' into dev