PEP8 fixes and feedback from @fnd incorporated