Improved Score Calculation