Small refactoring
- more descriptive name
- simpler settings
- response error handling