Style and puppet-lint fixes