updated scoring to be more object-oriented