Gemfile refactored