MNT: Mostly PEP8 formatting