refactor, normalize response object construction