Merge "fix E122 and E126 flake8 issues"