WIP: Reducing code complexity - Remove useless use of self.
Dropped Ruby 1.8 compatibility