- cleanup
- fix #1