Fix some pep8 problems

* Fix some pep8 problems.
* Fix #739.