Shuffling around in preparation for #26
More cleanups for Issue #25