bit more ruby 2.0 style