PEP8 fixes. Must fix pypy errors now its supported.