cleanup
initial commit for #32