Remove duplicate code
Merge pull request #100 from projecthydra/remove_duplicate_code

Remove duplicate code