Code quality improved

* All three files code quality improved
Merge pull request #19 from tarunbhardwaj/master

Increased Code Quality