Fix/ruby 2 0

Use ruby 2.0 syntax again and use `private_class_method` for class methods which were intended to be private.