Refactored Gemfile