Added changes to conform to PEP8