no private fns, break apart `first-column-chosen-case`
formatting and more refactoring