Refactoring & pycharm migration