Better PEP8 conformance.
Better PEP8 conformance and corrected a few bugs introduced by the conformance.