Modifications to try to conform with PEP 8