Merge pull request #115 from twogee/duplications

Remove duplicated code