Code cleanup

Zhang, Charlotterequested to merge
code-cleanup into master

edit the files based on format & pylint check

Merge request reports