Removed unnecessary code and few minor changes
Merge pull request #4 from mandava/patch-1

Removed unnecessary code and few minor changes