Refactoring evaluation metric to make it more focused.