edited files to conform with most of the PEP-0008 guidelines