Solve pep8 H302 issues