refactor plumbing and porcelain