A bunch of minor PEP 8 compliance tweaks