Remove code duplication
Merge pull request #150 from carezone/yas-remove-code-duplication

Remove code duplication