small code cleanup(cosmetic)
Merge remote-tracking branch 'origin/master'