Table Row Tag Clean-up Pt. 2