Clean up for aligning downsample intervals.
Renaming classes, and combining functions, and other clean-ups.