lint code using pep8 and pylint
Merge branch 'conform-pep8'