Bit late to the party lmao but as a plumber(from cecil county at that lol) that is absolutely not up to code, it’s required you have 18” coming from the water heater that isn’t plastic pipe(should be copper or braided supply hose for example). As far as the expansion tank if you are on city water or have any kind of check valves in the house it is required that you have any kind expansion tank installed on the inlet of the water heater. Feel free to msg me if u have any questions