Mostly cosmetic changes after running pycharm inspector