Revert "Cleaned up repeated functions"

Reverts s2ds-kpmg1/kpmg1#21