improve success / failure message