Duplicate code removed
Merge pull request #20 from PagedeGeek/some-remove-duplicated-code

Duplicate code removed