Fix PEP8 annoyances