Clean up.
Polish message output a bit.