Various PEP8 compliance changes.