Refactor puppet manifest