Improving logging on success