Improve output a bit