clean up fun
merge