Refactor success check

Feedback change