Small code-cleanup issues fixed
Merge pull request #2 from shivaram1190/code_cleanup

Code cleanup