refactored puppet classes