Some code cleanup
Merge pull request #136 from avinashcpandey/develop

Some code cleanup