success/fail message optimizations