ENH: addressed the PR comments, pep8