refactor scoring
Added more scoring factors