more basic refactorization

More of the same basic cookdown.