FIX: PEP8 and other cosmits