Refactor to remove send_value [#2]