be better on clean up