Code clean up (pep8/pylint)
Merge pull request #2 from maethu/respect-pep8-pylint

Respect pep8 pylint