pep8 and style modifications