- cleaning
- implementing Rest interface