PEP8 and PyCharm inspection changes.