Further PEP8 compliance changes.