Done some cleanup
Merge pull request #22 from rajmahendra/master

Done some cleanup