Formatting and cleanup

  - pylint and pep8