refactoring to make creation better (and work around ruby/puppet mismatch)