PEP8 improvements