Minor puppet refactor