Simplify logic for correct answers