MAINT: Cosmetic and PEP8 improvements.