clean up

and more