Reconciled reveiwer comments

Duff Stewart had several helpful comments regarding the last commit for this PR.
These were addressed, along with some additional minor Notebook clean-up.