Regularizing our puppet code