PEP8 Changes and Cleaning up imports