Optimize the code during Code review.
Merge branch 'master' of https://github.com/jadav1982/Liki.NisysDev