refactoring puppet site definition to reduce codespace