Ability to fill water containers from Kitchen Unit

Any non-hacky, more streamlined solutions? This code is quite redundant but hard to make more efficient without changing a lot. Comments welcome.