Hot Chocolate Win #1

All the hot chocolate items work now, thanks so much to mdiyo for his
help.

Also a code formatting change, bit easier to read