- cleanup
- added tests