Minor refactor of setting results