Reformated to Ruby 1.8 syntax