Cleanup from puppet-lint and puppet parser validation