refactored gemfile