clean up

still works with much smaller change