PEP8 included in extract script and more supports added