Heather-  cleaned up Score class