Made code more Rubyish
More Rubyish code