A question about water properties

I am not a scientist, more of a curious observer, but enjoy reading all your
questions and comments, most of which I don't really understand.

If this question is beneath you guys, I apologize for posting.

When I make a mug of coffee in the morning, I boil the water and pour it
into the mug until it is full. By the time the coffee is cool enough to
drink, it no longer fills the mug. I figure this is normal expansion and
contraction due to the heat causing increased atom activity which decreases
as the liquid cools.

I then assume that the liquid, assume water, continues to contract as
cooling takes place.

But, when the water is cooled to the point that it freezes, then it once
again expands. True, we now call the water by a different name, "ice", but
it is still the same material that we boiled.

Question: Does hot water continue to contract as it cools, up to the
instantaneous point that it begins to freeze, and at that instant, cease
contracting and begin expanding?

Sorry for the dumb question, but I am curious.
Bob