followup cleaning for #280 - [x] Tests pass - [x] Appropriate changes to documentation are included in the PR