Pep8 cleanup

Branch about the issue #226