Small cleanup (less pointers, proper score file reading)