Try moving the time of your last drink before 6:00pm. It made a big difference to me. I can see it in the Fitbit heart rate sleep chart.