Refactor return_values

Use more sane arguments