Add some spacing and a better return value for #set_entry_value