Tweak readability; PEP8 fixes