Fixed some style issues suggested by pycharm