(maint) fall cleaning

See #171 for previous discussion.
KS is already referenced a few lines up