Flake8ify #1730

* Fixed indentation and unused code for all the files in module to
  improve readability of code.

Issue ID: 179001