refactor, early return in field when response is undefined
clean code, respect conventions