refactored puppet configuration