Cleanup/expansion of puppet/func