Cleanup output a bit