Small part of code clean and fixed#1

Dudusiao wants to merge 2 commits into

ashllay:masterashllay/Dataserver:masterfrom

Dudusiao:masterDudusiao/Dataserver:masterCopy head branch name to clipboard