- improved service layer
- strip unnecessary exceptions