more Rubyfication