Improved style according to https://github.com/styleguide/ruby