Merge "Fix Pep8 issues related to \"