Refactor Gemfile