tweak clean up