- fixed pep8 issues.
- fixed refactor issues.