Replace mixin class with mask_by_score function
Move content from etc to by_score