Cleaning up code - follow Puppet lint