revision for events-based scoring; 
cleaning