some pep8 adaptions