Tamper function(s) refactoring (really no need for returning headers as they are passed by reference)