Switch to idiomatic ruby