Improve output for success/failure conditions