Some cleaning in return_address.c