Move sender info into separate function