Rails 4.1
some optimization