refactor Plumber