PyCharm suggested changes, mostly PEP8.