Styling fixes.
Fix grouping across DST changes and reduce looping.