Code refactoring in manifests for Agent and Puppet Reporter