code clean
Merge pull request #405 from xanscale/master

code clean