Tidying up of Puppet deployment