GH issue work

- DRY out js code
- Update to score to show correct / total