beautify some codes
Merge pull request #1 from usbuild/master

beautify some codes