Clean up code and store more score data