Code cleanup

Zhang, Charlotterequested to merge
code-cleanup into master

Add function descriptions and comments, reformat code, delete unnecessary code

Merge request reports