Thanks Carl for the photos. That's the same way it looks in mine. One thing my sister-in-law, who is an electrician, told me was that there are two electrical connections to close to the water heater in case of any leak. We cover the 4"x4" box with a 6"x6" inches PVC box upside down. In addition, we replace the flimsy water heater connection with a 2"x 4" PVC box. Both should prevent any water leak to be in contact with the electrical stuff.
2017 Leprechaun 311 FS
Jeep Patriot and Cherokee as toad.