merge @mzafer pull request and better pep-8