Pep8 Pylint fixes.
Merge pull request #1062 from akbargumbira/develop

Pep8 Pylint fixes.