Tidy up indentation, remove duplicated/dead code.
Show year in date for last/next year's events.