Refactors a couple of the private definitions to use tap