31453 31498 code cleanup
Merge pull request #16 from Jagadees-zyxware/master

31453 31498 Code Cleanup