Retirement tax questions

So I will not make any changes to my 2019 tax return to account for my 2019 excess contribution to my Roth 401k.

I will just make sure to get the excess contribution out of my Roth 401k before April 15 2020, and I will include any income on that excess contribution on my 2020 tax return per the 1099-R that I will receive.  Thank you.