Cleanup in output and error messages.