cleanup
fixed #237