Factor rating cleanup