Rename r -> return_value for readability