extra refactor and scoring prep/base