Refactor score display