With dd, I ask her to speak properly or nicely to me, meaning she doesn't whinge and uses manners. I then give her an example 'mum can you please get me some watermelon' rather than 'i want watermelon'. It has definitely helped, especially since she won't get anything until she asks nicely.

Not sure if that would help?