Minor fixes - mostly pep8

but don't merge this yet; we can chat and do review back and forth a bit