more calendar forming
formatting
formatting
refactoring calendar generator to helper methods