Small bits of misc cleanup
More cleanup
Fix typo introduced in 11fba2
Merge branch 'cleanup' into release/1.2.2

Conflicts:
	__init__.py