added explicit sort by score
removed commented code