Refactor code, one response type one file