beginning some idiomatic ruby changes