- minor PEP8 adaptations