Tidy, prior to formalizing Builders