ruby 2.0 syntax cleanup