Bits of code cleanup for plumbing component