linting code and conforming to pep8

Cleaning up and conforming to PEP8