FIX: PEP8 fixes