Filing for 401k over contribution excess amount correction

I'm trying to file for 401k over contribution excess amount correction, I have already withdrawn the excess amount but didn't receive a corrective 1099-R. My excess contribution was split between traditional 401(k) and Roth 401(k). For traditional 401k excess amount, I reported the number in the "Miscellaneous inform, 1099-A, 1099-C" section. For Roth 401k excess amount, there is a "Roth 401(k) taxable amount" (interest) component and a "Roth 401(k) non-taxable amount" component. For the "Roth 401(k) taxable amount" component, I reported the number in the "Miscellaneous inform, 1099-A, 1099-C" section. I'm guessing I don't have to report anything for the "Roth 401(k) non-taxable amount" component since it should already be reflected on W2. Can someone help me confirm if this is the correct way to do it?