diff --git a/lib/voicemeeter/meta.rb b/lib/voicemeeter/meta.rb
index 27208a5..55e840e 100644
--- a/lib/voicemeeter/meta.rb
+++ b/lib/voicemeeter/meta.rb
@@ -3,64 +3,55 @@ module Voicemeeter
     # Accessor methods
     def make_accessor_bool(*params)
       params.each do |param|
-        define_singleton_method(param) { self.getter(param).to_i == 1 }
+        define_singleton_method(param) { getter(param).to_i == 1 }
+
         define_singleton_method("#{param}=") do |value|
-          self.setter(param, value && 1 || 0)
+          setter(param, value && 1 || 0)
         end
       end
     end
 
     def make_accessor_string(*params)
       params.each do |param|
-        define_singleton_method(param) { self.getter(param, true) }
+        define_singleton_method(param) { getter(param, true) }
 
-        define_singleton_method("#{param}=") do |value|
-          self.setter(param, value)
-        end
+        define_singleton_method("#{param}=") { |value| setter(param, value) }
       end
     end
 
     def make_accessor_int(*params)
       params.each do |param|
-        define_singleton_method("#{param}") do
-          return self.getter("#{param}").to_i
-        end
+        define_singleton_method(param) { getter(param).to_i }
 
-        define_singleton_method("#{param}=") do |value|
-          self.setter("#{param}", value)
-        end
+        define_singleton_method("#{param}=") { |value| setter(param, value) }
       end
     end
 
     def make_accessor_float(*params)
       params.each do |param|
-        define_singleton_method(param) { self.getter(param) }
+        define_singleton_method(param) { getter(param) }
 
-        define_singleton_method("#{param}=") do |value|
-          self.setter(param, value)
-        end
+        define_singleton_method("#{param}=") { |value| setter(param, value) }
       end
     end
 
     # reader methods
     def make_reader_string(*params)
       params.each do |param|
-        define_singleton_method(param) { self.getter(param, true) }
+        define_singleton_method(param) { getter(param, true) }
       end
     end
 
     def make_reader_int(*params)
       params.each do |param|
-        define_singleton_method(param) { self.getter(param).to_i }
+        define_singleton_method(param) { getter(param).to_i }
       end
     end
 
     # writer methods
     def make_writer_string(*params)
       params.each do |param|
-        define_singleton_method("#{param}=") do |value|
-          self.setter(param, value)
-        end
+        define_singleton_method("#{param}=") { |value| setter(param, value) }
       end
     end
   end
diff --git a/lib/voicemeeter/midi.rb b/lib/voicemeeter/midi.rb
index 1a3dcbe..7b9d74b 100644
--- a/lib/voicemeeter/midi.rb
+++ b/lib/voicemeeter/midi.rb
@@ -7,11 +7,11 @@ module Voicemeeter
     end
 
     def get(key)
-      @cache[key]
+      cache[key]
     end
 
     def set(key, velocity)
-      @cache[key] = velocity
+      cache[key] = velocity
     end
   end
 end