Various PEP8 touch-ups