Minor improvements
Merge pull request #17 from bobgru/elim-duplication

Minor improvements