Refactor Score
Refactor Vector, fix Score