Refactor some code and prep for a small release

[fxamacker]

Found some code in need of refactoring today (during my postponed Labor Day holiday).

Refactor the code and tag a small release before making bigger changes.

If time allows, also resolve some nits.

ref: 776586F8294BF4DF507E33853947C08F