Merge "Make files pep8 compliant"