Refactor : Removed Some Code smells to increase Readability and Maintainability

[Patel-Savan]

I have made changes for removing some design and implementation smells in your code. Please review the changes and accept the pull request If possible.