Moved scoring logic to single method