Modify to conform to PEP8