BUG: Fix PEP8 style and failing speed test