firther cleanup / fix (beware pycharm refactoring)