Stylistic changes, more compliant with PEP