do a lot of small refactoring using pycharm