Minor PEP cleanups after import into pycharm