clean up
better message