Fixed minor formatting issues of comments and two import errors.
Merge remote-tracking branch 'jorge/issue691' into 691-pep8-fixes