diff --git a/lib/puppet/provider/zabbix.rb b/lib/puppet/provider/zabbix.rb
index 6cd01fb04..9d8828d76 100644
--- a/lib/puppet/provider/zabbix.rb
+++ b/lib/puppet/provider/zabbix.rb
@@ -1,5 +1,5 @@
-# encoding: utf-8
 # zabbix provider type for puppet
+# rubocop:disable Style/ClassAndModuleChildren
 class Puppet::Provider::Zabbix < Puppet::Provider
   # Require the zabbixapi gem
   def self.require_zabbix
diff --git a/lib/puppet/provider/zabbix_application/ruby.rb b/lib/puppet/provider/zabbix_application/ruby.rb
index 0907ddc49..569218b99 100644
--- a/lib/puppet/provider/zabbix_application/ruby.rb
+++ b/lib/puppet/provider/zabbix_application/ruby.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'zabbix'))
 Puppet::Type.type(:zabbix_application).provide(:ruby, parent: Puppet::Provider::Zabbix) do
   def connect
diff --git a/lib/puppet/provider/zabbix_host/ruby.rb b/lib/puppet/provider/zabbix_host/ruby.rb
index f46dee2b1..94021d82f 100644
--- a/lib/puppet/provider/zabbix_host/ruby.rb
+++ b/lib/puppet/provider/zabbix_host/ruby.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'zabbix'))
 Puppet::Type.type(:zabbix_host).provide(:ruby, parent: Puppet::Provider::Zabbix) do
   def create
diff --git a/lib/puppet/provider/zabbix_hostgroup/ruby.rb b/lib/puppet/provider/zabbix_hostgroup/ruby.rb
index bd746f551..80156e26c 100644
--- a/lib/puppet/provider/zabbix_hostgroup/ruby.rb
+++ b/lib/puppet/provider/zabbix_hostgroup/ruby.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'zabbix'))
 Puppet::Type.type(:zabbix_hostgroup).provide(:ruby, parent: Puppet::Provider::Zabbix) do
   def connect
diff --git a/lib/puppet/provider/zabbix_proxy/ruby.rb b/lib/puppet/provider/zabbix_proxy/ruby.rb
index b4952988a..8a04df542 100644
--- a/lib/puppet/provider/zabbix_proxy/ruby.rb
+++ b/lib/puppet/provider/zabbix_proxy/ruby.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'zabbix'))
 Puppet::Type.type(:zabbix_proxy).provide(:ruby, parent: Puppet::Provider::Zabbix) do
   def create
diff --git a/lib/puppet/provider/zabbix_template/ruby.rb b/lib/puppet/provider/zabbix_template/ruby.rb
index 575fb96f3..a990eaac6 100644
--- a/lib/puppet/provider/zabbix_template/ruby.rb
+++ b/lib/puppet/provider/zabbix_template/ruby.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'zabbix'))
 Puppet::Type.type(:zabbix_template).provide(:ruby, parent: Puppet::Provider::Zabbix) do
   def create
diff --git a/lib/puppet/provider/zabbix_template_host/ruby.rb b/lib/puppet/provider/zabbix_template_host/ruby.rb
index 6642b99e6..20afb7bae 100644
--- a/lib/puppet/provider/zabbix_template_host/ruby.rb
+++ b/lib/puppet/provider/zabbix_template_host/ruby.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'zabbix'))
 Puppet::Type.type(:zabbix_template_host).provide(:ruby, parent: Puppet::Provider::Zabbix) do
   def template_name
diff --git a/lib/puppet/provider/zabbix_userparameters/ruby.rb b/lib/puppet/provider/zabbix_userparameters/ruby.rb
index 3c35471e8..10ced2d12 100644
--- a/lib/puppet/provider/zabbix_userparameters/ruby.rb
+++ b/lib/puppet/provider/zabbix_userparameters/ruby.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'zabbix'))
 Puppet::Type.type(:zabbix_userparameters).provide(:ruby, parent: Puppet::Provider::Zabbix) do
   def create
diff --git a/lib/puppet/type/zabbix_application.rb b/lib/puppet/type/zabbix_application.rb
index 78f411068..bfc70987b 100644
--- a/lib/puppet/type/zabbix_application.rb
+++ b/lib/puppet/type/zabbix_application.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..'))
 require 'puppet/util/zabbix'
 
diff --git a/lib/puppet/type/zabbix_host.rb b/lib/puppet/type/zabbix_host.rb
index bf07d140d..1f40a2e9f 100644
--- a/lib/puppet/type/zabbix_host.rb
+++ b/lib/puppet/type/zabbix_host.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 Puppet::Type.newtype(:zabbix_host) do
   ensurable do
     defaultvalues
diff --git a/lib/puppet/type/zabbix_hostgroup.rb b/lib/puppet/type/zabbix_hostgroup.rb
index 9738be30a..b8123a02f 100644
--- a/lib/puppet/type/zabbix_hostgroup.rb
+++ b/lib/puppet/type/zabbix_hostgroup.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..'))
 require 'puppet/util/zabbix'
 
diff --git a/lib/puppet/type/zabbix_proxy.rb b/lib/puppet/type/zabbix_proxy.rb
index 69674f3a1..6ecaffc90 100644
--- a/lib/puppet/type/zabbix_proxy.rb
+++ b/lib/puppet/type/zabbix_proxy.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 Puppet::Type.newtype(:zabbix_proxy) do
   ensurable do
     defaultvalues
diff --git a/lib/puppet/type/zabbix_template.rb b/lib/puppet/type/zabbix_template.rb
index 54f9c3cc8..039b2279c 100644
--- a/lib/puppet/type/zabbix_template.rb
+++ b/lib/puppet/type/zabbix_template.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 Puppet::Type.newtype(:zabbix_template) do
   ensurable do
     defaultvalues
diff --git a/lib/puppet/type/zabbix_template_host.rb b/lib/puppet/type/zabbix_template_host.rb
index 4f90b7944..ac27f89b4 100644
--- a/lib/puppet/type/zabbix_template_host.rb
+++ b/lib/puppet/type/zabbix_template_host.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..'))
 require 'puppet/util/zabbix'
 
diff --git a/lib/puppet/type/zabbix_userparameters.rb b/lib/puppet/type/zabbix_userparameters.rb
index 6a868ceee..f2212b65d 100644
--- a/lib/puppet/type/zabbix_userparameters.rb
+++ b/lib/puppet/type/zabbix_userparameters.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..'))
 Puppet::Type.newtype(:zabbix_userparameters) do
   ensurable do
diff --git a/lib/puppet/util/zabbix.rb b/lib/puppet/util/zabbix.rb
index 8774c225d..d8dffae41 100644
--- a/lib/puppet/util/zabbix.rb
+++ b/lib/puppet/util/zabbix.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 # this module adds additional params to a puppet type
 module Puppet::Util::Zabbix # rubocop:disable Style/ClassAndModuleChildren
   def self.add_zabbix_type_methods(type)
diff --git a/manifests/agent.pp b/manifests/agent.pp
index 701dd15d2..ae7902ae9 100644
--- a/manifests/agent.pp
+++ b/manifests/agent.pp
@@ -265,8 +265,7 @@
   # is set to for example "eth1" or "bond0.73".
   if ($listenip != undef) {
     if ($listenip =~ /^(eth|bond|lxc|eno|tap|tun).*/) {
-      $int_name  = "ipaddress_${listenip}"
-      $listen_ip = inline_template('<%= scope.lookupvar(int_name) %>')
+      $int_name  = getvar("::ipaddress_${listenip}")
     } elsif is_ip_address($listenip) or $listenip == '*' {
       $listen_ip = $listenip
     } else {
diff --git a/manifests/proxy.pp b/manifests/proxy.pp
index ae6ec7652..8396e7251 100644
--- a/manifests/proxy.pp
+++ b/manifests/proxy.pp
@@ -421,8 +421,7 @@
   # is set to for example "eth1" or "bond0.73".
   if ($listenip != undef) {
     if ($listenip =~ /^(eth|bond|lxc|eno|tap|tun).*/) {
-      $int_name  = "ipaddress_${listenip}"
-      $listen_ip = inline_template('<%= scope.lookupvar(int_name) %>')
+      $int_name  = getvar("::ipaddress_${listenip}")
     } elsif is_ip_address($listenip) {
       $listen_ip = $listenip
     } else {
diff --git a/metadata.json b/metadata.json
index 0a23cd5c4..71ec0c418 100644
--- a/metadata.json
+++ b/metadata.json
@@ -10,7 +10,7 @@
     },
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 4.1.0"
+      "version_requirement": ">= 4.4.0"
     },
     {
       "name": "puppetlabs/mysql",
diff --git a/spec/classes/agent_spec.rb b/spec/classes/agent_spec.rb
index fc4aa4c99..baa22a99e 100644
--- a/spec/classes/agent_spec.rb
+++ b/spec/classes/agent_spec.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'spec_helper'
 
 describe 'zabbix::agent' do
diff --git a/spec/classes/coverage_spec.rb b/spec/classes/coverage_spec.rb
index 0a8aedda2..c083569a7 100644
--- a/spec/classes/coverage_spec.rb
+++ b/spec/classes/coverage_spec.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'rspec-puppet'
 
 at_exit { RSpec::Puppet::Coverage.report! }
diff --git a/spec/classes/database_mysql_spec.rb b/spec/classes/database_mysql_spec.rb
index d82d99ba5..e45b05664 100644
--- a/spec/classes/database_mysql_spec.rb
+++ b/spec/classes/database_mysql_spec.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'spec_helper'
 
 describe 'zabbix::database::mysql' do
diff --git a/spec/classes/database_postgresql_spec.rb b/spec/classes/database_postgresql_spec.rb
index db9a3495c..857b39d4e 100644
--- a/spec/classes/database_postgresql_spec.rb
+++ b/spec/classes/database_postgresql_spec.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'spec_helper'
 
 describe 'zabbix::database::postgresql' do
diff --git a/spec/classes/database_spec.rb b/spec/classes/database_spec.rb
index ee926acd3..48aa02477 100644
--- a/spec/classes/database_spec.rb
+++ b/spec/classes/database_spec.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'spec_helper'
 
 describe 'zabbix::database' do
diff --git a/spec/classes/javagateway_spec.rb b/spec/classes/javagateway_spec.rb
index 8a24fa1bd..a158d6885 100644
--- a/spec/classes/javagateway_spec.rb
+++ b/spec/classes/javagateway_spec.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'spec_helper'
 
 describe 'zabbix::javagateway' do
diff --git a/spec/classes/proxy_spec.rb b/spec/classes/proxy_spec.rb
index a39abdb6c..cd099e057 100644
--- a/spec/classes/proxy_spec.rb
+++ b/spec/classes/proxy_spec.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'spec_helper'
 
 describe 'zabbix::proxy' do
diff --git a/spec/classes/repo_spec.rb b/spec/classes/repo_spec.rb
index 886d4d0f5..462a3f7d9 100644
--- a/spec/classes/repo_spec.rb
+++ b/spec/classes/repo_spec.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'spec_helper'
 
 describe 'zabbix::repo' do
diff --git a/spec/classes/sender_spec.rb b/spec/classes/sender_spec.rb
index d974b771d..6bd162489 100644
--- a/spec/classes/sender_spec.rb
+++ b/spec/classes/sender_spec.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'spec_helper'
 
 describe 'zabbix::sender' do
diff --git a/spec/classes/server_spec.rb b/spec/classes/server_spec.rb
index 81716b340..83290f1e7 100644
--- a/spec/classes/server_spec.rb
+++ b/spec/classes/server_spec.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'spec_helper'
 
 describe 'zabbix::server' do
diff --git a/spec/classes/userparameter_spec.rb b/spec/classes/userparameter_spec.rb
index af7b2595c..2c52326eb 100644
--- a/spec/classes/userparameter_spec.rb
+++ b/spec/classes/userparameter_spec.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'spec_helper'
 
 describe 'zabbix::userparameter' do
diff --git a/spec/classes/web_spec.rb b/spec/classes/web_spec.rb
index ed0244918..d25138a43 100644
--- a/spec/classes/web_spec.rb
+++ b/spec/classes/web_spec.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'spec_helper'
 
 def package_provider_for_gems
@@ -117,7 +116,8 @@ def package_provider_for_gems
           database_name: 'zabbix-server',
           database_user: 'zabbix-server',
           database_password: 'zabbix-server',
-          zabbix_server: 'localhost')
+          zabbix_server: 'localhost'
+        )
       end
 
       it { should contain_file('/etc/zabbix/web/zabbix.conf.php').with_content(/^\$DB\['SERVER'\]   = 'localhost'/) }
diff --git a/spec/defines/userparameters_spec.rb b/spec/defines/userparameters_spec.rb
index 51d91f5ff..aced9f9b9 100644
--- a/spec/defines/userparameters_spec.rb
+++ b/spec/defines/userparameters_spec.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'spec_helper'
 
 describe 'zabbix::userparameters', type: :define do
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index f0a0b3056..1ffdf178d 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'puppetlabs_spec_helper/module_spec_helper'
 require 'rspec-puppet-facts'
 include RspecPuppetFacts