refactored puppet manifest