Small style tweaks
Improve scoring