pep8 stuff
merge