Fixed a bunch of syntax to conform to PEP8