- cleanup
- fix #3