BUG: PEP8 fixes