code refactory
Merge pull request #1 from acharyarajiv/dev

code refactory