FIX: PEP8 + old numpy