Making both the methods a bit more Rubyesque