Enhanced score calculation