pycharm-professional: clean up and improve