Continued changes for PEP8