Code refactor

Merged Wang Yuyang requested to merge Code-Refactor into master

Merge request reports