cleanup
fix #36 and #35