code clean
Merge pull request #415 from xanscale/master

code clean