Minor refactoring in the plumbings