Merge "Clean up pep8 E502 violations"