Merge "Make E123 pep8 clean"