Correcting setup.py and removing certain pep8 violations

Correcting setup.py and removing certain pep8 violations