Use more Rubyish syntax