Adds nicer display of calendar events, simplifies code in calendar job