Make Puppet code nicer to read