PEP8 Changes and cleanup