refactor methods
Merge pull request #84 from anilsaldhana/master

refactor methods