Changes to conform to PEP8