Revert "Cleaned up repeated functions"
Merge pull request #22 from s2ds-kpmg1/revert-21-master

Revert "Cleaned up repeated functions"