Fix coding style
Merge branch 'pep8'