Correct TPR/FPR and remove unnecessary return vars