Improved the way scoring is handled

This stops scoring on things like spaces and `command --flag`.