Yes, it used to be worse. But it still comes out when I feel like she will dislike something I have said or done.

Like I just recently told her that something she says all the time always sounds so awful to me because, although I know she doesn't mean it this way, it comes across to me in a mocking tone. And that's because my mother used to say the same thing while mocking me.