Playing with Pycharm, fixed some more pep8 things