Pep8 compliance

Went through both files and conformed code to pep8.