Residential, commercial water heaters and storage tanks