minor refactoring
response format refactoring