PEP8 adaptions