Improve output a bit.