Improve score computation