pep8 compliance improvements

pep8 compliance improvements