PEP8 Changes