Remove duplication
Merge pull request #288 from xoebus/de-dup

Remove Some Duplication