PEP8. And more improvements.