Improve score generator