PEP 8 improvements