PEP8 compliancy changes. Other than line width limits, the rest of the file appears to be PEP8 compliant